Hi,
I'll strike out the files I've fixed on the list.
Christina
>From 5c4f34c216acbca2e4ef8ff226691385f8fe3f7e Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <chrrossman...@web.de>
Date: Sat, 29 Jan 2011 22:29:00 +0100
Subject: [PATCH] Easy hacks: removed double line spacing (and some dead code)
---
.../source/draw/xmloff_XMLImageMapContext.cxx | 56 ++++-----
.../bf_xmloff/source/draw/xmloff_sdxmlexp.cxx | 23 ----
.../bf_xmloff/source/draw/xmloff_ximpshap.cxx | 132 +++++--------------
3 files changed, 59 insertions(+), 152 deletions(-)
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
index 3349886..102c62c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ using ::com::sun::star::drawing::PointSequenceSequence;
using ::com::sun::star::document::XEventsSupplier;
-enum XMLImageMapToken
+enum XMLImageMapToken
{
XML_TOK_IMAP_URL,
XML_TOK_IMAP_DESCRIPTION,
@@ -84,9 +84,9 @@ enum XMLImageMapToken
static SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
{
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL },
+ { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL },
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_IMAP_NAME },
- { XML_NAMESPACE_DRAW, XML_NOHREF, XML_TOK_IMAP_NOHREF },
+ { XML_NAMESPACE_DRAW, XML_NOHREF, XML_TOK_IMAP_NOHREF },
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_IMAP_X },
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_IMAP_Y },
{ XML_NAMESPACE_SVG, XML_CX, XML_TOK_IMAP_CENTER_X },
@@ -142,20 +142,20 @@ public:
::com::sun::star::container::XIndexContainer> xMap,
const sal_Char* pServiceName);
- void StartElement(
+ void StartElement(
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList >& xAttrList );
void EndElement();
- SvXMLImportContext *CreateChildContext(
+ SvXMLImportContext *CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList );
protected:
-
+
virtual void ProcessAttribute(
enum XMLImageMapToken eToken,
const ::rtl::OUString& rValue);
@@ -189,7 +189,7 @@ XMLImageMapObjectContext::XMLImageMapObjectContext(
bIsActive(sal_True),
bValid(sal_False)
{
- DBG_ASSERT(NULL != pServiceName,
+ DBG_ASSERT(NULL != pServiceName,
"Please supply the image map object service name");
Reference<XMultiServiceFactory> xFactory(GetImport().GetModel(),UNO_QUERY);
@@ -209,7 +209,7 @@ XMLImageMapObjectContext::XMLImageMapObjectContext(
// else: can't even get factory -> ignore
}
-void XMLImageMapObjectContext::StartElement(
+void XMLImageMapObjectContext::StartElement(
const Reference<XAttributeList >& xAttrList )
{
SvXMLTokenMap aMap(aImageMapObjectTokenMap);
@@ -219,7 +219,7 @@ void XMLImageMapObjectContext::StartElement(
{
OUString sLocalName;
sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().
- GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
+ GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
&sLocalName );
OUString sValue = xAttrList->getValueByIndex(nAttr);
@@ -245,7 +245,7 @@ void XMLImageMapObjectContext::EndElement()
// else: not valid -> don't create and insert
}
-SvXMLImportContext* XMLImageMapObjectContext::CreateChildContext(
+SvXMLImportContext* XMLImageMapObjectContext::CreateChildContext(
USHORT nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
@@ -266,7 +266,6 @@ SvXMLImportContext* XMLImageMapObjectContext::CreateChildContext(
else
return SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName,
xAttrList);
-
}
void XMLImageMapObjectContext::ProcessAttribute(
@@ -286,7 +285,7 @@ void XMLImageMapObjectContext::ProcessAttribute(
case XML_TOK_IMAP_NOHREF:
bIsActive = ! IsXMLToken(rValue, XML_NOHREF);
break;
-
+
case XML_TOK_IMAP_NAME:
sNam = rValue;
break;
@@ -299,10 +298,10 @@ void XMLImageMapObjectContext::Prepare(
Reference<XPropertySet> & rPropertySet)
{
Any aAny;
-
+
aAny <<= sUrl;
rPropertySet->setPropertyValue( sURL, aAny );
-
+
aAny <<= sDescriptionBuffer.makeStringAndClear();
rPropertySet->setPropertyValue( sDescription, aAny );
@@ -311,7 +310,7 @@ void XMLImageMapObjectContext::Prepare(
aAny.setValue( &bIsActive, ::getBooleanCppuType() );
rPropertySet->setPropertyValue( sIsActive, aAny );
-
+
aAny <<= sNam;
rPropertySet->setPropertyValue( sName, aAny );
}
@@ -379,7 +378,7 @@ void XMLImageMapRectangleContext::ProcessAttribute(
switch (eToken)
{
case XML_TOK_IMAP_X:
- if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
+ if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
rValue))
{
aRectangle.X = nTmp;
@@ -387,7 +386,7 @@ void XMLImageMapRectangleContext::ProcessAttribute(
}
break;
case XML_TOK_IMAP_Y:
- if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
+ if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
rValue))
{
aRectangle.Y = nTmp;
@@ -395,7 +394,7 @@ void XMLImageMapRectangleContext::ProcessAttribute(
}
break;
case XML_TOK_IMAP_WIDTH:
- if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
+ if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
rValue))
{
aRectangle.Width = nTmp;
@@ -403,7 +402,7 @@ void XMLImageMapRectangleContext::ProcessAttribute(
}
break;
case XML_TOK_IMAP_HEIGTH:
- if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
+ if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
rValue))
{
aRectangle.Height = nTmp;
@@ -505,7 +504,7 @@ void XMLImageMapPolygonContext::Prepare(
Reference<XPropertySet> & rPropertySet)
{
// process view box
- SdXMLImExViewBox aViewBox(sViewBoxString,
+ SdXMLImExViewBox aViewBox(sViewBoxString,
GetImport().GetMM100UnitConverter());
// get polygon sequence
@@ -587,7 +586,7 @@ void XMLImageMapCircleContext::ProcessAttribute(
switch (eToken)
{
case XML_TOK_IMAP_CENTER_X:
- if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
+ if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
rValue))
{
aCenter.X = nTmp;
@@ -595,7 +594,7 @@ void XMLImageMapCircleContext::ProcessAttribute(
}
break;
case XML_TOK_IMAP_CENTER_Y:
- if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
+ if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
rValue))
{
aCenter.Y = nTmp;
@@ -603,7 +602,7 @@ void XMLImageMapCircleContext::ProcessAttribute(
}
break;
case XML_TOK_IMAP_RADIUS:
- if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
+ if (GetImport().GetMM100UnitConverter().convertMeasure(nTmp,
rValue))
{
nRadius = nTmp;
@@ -635,13 +634,6 @@ void XMLImageMapCircleContext::Prepare(
-
-
-
-
-
-
-
TYPEINIT1(XMLImageMapContext, SvXMLImportContext);
XMLImageMapContext::XMLImageMapContext(
@@ -669,7 +661,7 @@ XMLImageMapContext::~XMLImageMapContext()
{
}
-SvXMLImportContext *XMLImageMapContext::CreateChildContext(
+SvXMLImportContext *XMLImageMapContext::CreateChildContext(
USHORT nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
index 8fed627..f8486ca 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx
@@ -31,51 +31,28 @@
#endif
#include "nmspmap.hxx"
-
#include "xmlnmspe.hxx"
-
#include "xmluconv.hxx"
-
#include "xmlmetae.hxx"
-
#include <com/sun/star/presentation/XPresentationSupplier.hpp>
-
#include <com/sun/star/presentation/XCustomPresentationSupplier.hpp>
-
#include "sdxmlexp.hxx"
-
#include "sdxmlexp_impl.hxx"
-
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-
#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
-
#include <com/sun/star/presentation/XHandoutMasterSupplier.hpp>
-
#include <com/sun/star/view/PaperOrientation.hpp>
-
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-
#include <com/sun/star/form/XFormsSupplier.hpp>
-
#include <com/sun/star/presentation/XPresentationPage.hpp>
-
#include <com/sun/star/drawing/XMasterPageTarget.hpp>
-
#include <tools/debug.hxx>
-
#include "sdpropls.hxx"
-
#include <com/sun/star/beans/XPropertyState.hpp>
-
#include "xexptran.hxx"
-
#include <cppuhelper/implbase1.hxx>
-
#include "PropertySetMerger.hxx"
-
#include "layerexp.hxx"
-
#include "XMLNumberStylesExport.hxx"
namespace binfilter {
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx
index e6b6869..88851c9 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,56 +31,25 @@
#endif
#include <tools/debug.hxx>
-
#include <com/sun/star/drawing/XGluePointsSupplier.hpp>
-
-
#include <com/sun/star/drawing/GluePoint2.hpp>
-
-
-
#include <comphelper/extract.hxx>
-
-
#include "XMLBase64ImportContext.hxx"
-
#include "XMLShapeStyleContext.hxx"
-
#include "xmluconv.hxx"
-
-
#include <com/sun/star/drawing/CircleKind.hpp>
-
-
-
#include <com/sun/star/drawing/XControlShape.hpp>
-
-
-
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-
-
-
#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-
#include <com/sun/star/drawing/ConnectorType.hpp>
-
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
-
-
-
#include "ximpstyl.hxx"
-
-#include"xmlnmspe.hxx"
-
-
+#include "xmlnmspe.hxx"
#include "XMLImageMapContext.hxx"
-
#include "sdpropls.hxx"
-
#include "eventimp.hxx"
-
#include "XMLEmbeddedObjectImportContext.hxx"
+
namespace binfilter {
using namespace ::rtl;
@@ -89,7 +58,7 @@ using namespace ::binfilter::xmloff::token;
SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[] =
{
- { XML_TOP_LEFT, drawing::Alignment_TOP_LEFT },
+ { XML_TOP_LEFT, drawing::Alignment_TOP_LEFT },
{ XML_TOP, drawing::Alignment_TOP },
{ XML_TOP_RIGHT, drawing::Alignment_TOP_RIGHT },
{ XML_LEFT, drawing::Alignment_LEFT },
@@ -103,8 +72,8 @@ SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[] =
SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] =
{
- { XML_AUTO, drawing::EscapeDirection_SMART },
- { XML_LEFT, drawing::EscapeDirection_LEFT },
+ { XML_AUTO, drawing::EscapeDirection_SMART },
+ { XML_LEFT, drawing::EscapeDirection_LEFT },
{ XML_RIGHT, drawing::EscapeDirection_RIGHT },
{ XML_UP, drawing::EscapeDirection_UP },
{ XML_DOWN, drawing::EscapeDirection_DOWN },
@@ -234,7 +203,7 @@ SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT nPrefix,
xTxtImport->SetCursor( mxCursor );
}
- // remember old list item and block (#91964#) and reset them
+ // remember old list item and block (#91964#) and reset them
// for the text frame
mxOldListBlock = xTxtImport->_GetListBlock();
mxOldListItem = xTxtImport->_GetListItem();
@@ -524,7 +493,6 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
{
try
{
-
uno::Reference< style::XStyleFamiliesSupplier > xFamiliesSupplier( GetImport().GetModel(), uno::UNO_QUERY );
if( xFamiliesSupplier.is() )
@@ -532,7 +500,6 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
uno::Reference< container::XNameAccess > xFamilies( xFamiliesSupplier->getStyleFamilies() );
if( xFamilies.is() )
{
-
uno::Reference< container::XNameAccess > xFamily;
if( XML_STYLE_FAMILY_SD_PRESENTATION_ID == mnStyleFamily )
@@ -541,7 +508,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
if( -1 != nPos )
{
OUString aFamily( aStyleName.copy( 0, nPos ) );
-
+
xFamilies->getByName( aFamily ) >>= xFamily;
aStyleName = aStyleName.copy( nPos + 1 );
}
@@ -603,7 +570,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
// set PropertySet on object
pStyle->FillPropertySet(xPropSet);
-
+
} while(0);
}
catch( uno::Exception& )
@@ -749,9 +716,7 @@ sal_Bool SdXMLShapeContext::isPresentationShape() const
(const_cast<SdXMLShapeContext*>(this))->GetImport().GetShapeImport()->IsPresentationShapesSupported();
}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLRectShapeContext, SdXMLShapeContext );
@@ -823,8 +788,8 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+
TYPEINIT1( SdXMLLineShapeContext, SdXMLShapeContext );
@@ -905,7 +870,7 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
aTopLeft.X = mnX2;
aBottomRight.X = mnX1;
}
-
+
if(mnY1 > mnY2)
{
aTopLeft.Y = mnY2;
@@ -944,8 +909,7 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLEllipseShapeContext, SdXMLShapeContext );
@@ -1073,8 +1037,7 @@ void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLPolygonShapeContext, SdXMLShapeContext );
@@ -1162,8 +1125,7 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLPathShapeContext, SdXMLShapeContext );
@@ -1251,7 +1213,7 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
// #89344# test for mxShape.is() and not for mxShapes.is() to support
// shape import helper classes WITHOUT XShapes (member mxShapes). This
// is used by the writer.
- if( mxShape.is() )
+ if( mxShape.is() )
{
SetStyle();
SetLayer();
@@ -1292,8 +1254,7 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLTextBoxShapeContext, SdXMLShapeContext );
@@ -1400,15 +1361,6 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
- // set parameters on shape
-//A AW->CL: Eventually You need to strip scale and translate from the transformation
-//A to reach the same goal again.
-//A if(!bIsPresShape || mbIsUserTransformed)
-//A {
-//A // set pos and size on shape, this should remove binding
-//A // to pres object on masterpage
-//A SetSizeAndPosition();
-//A }
// set pos, size, shear and rotate
SetTransformation();
@@ -1433,8 +1385,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLControlShapeContext, SdXMLShapeContext );
@@ -1506,8 +1457,7 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLConnectorShapeContext, SdXMLShapeContext );
@@ -1683,8 +1633,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLMeasureShapeContext, SdXMLShapeContext );
@@ -1796,8 +1745,7 @@ void SdXMLMeasureShapeContext::EndElement()
while(0);
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLPageShapeContext, SdXMLShapeContext );
@@ -1891,8 +1839,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLCaptionShapeContext, SdXMLShapeContext );
@@ -1977,8 +1924,7 @@ void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLGraphicObjectShapeContext, SdXMLShapeContext );
@@ -2106,7 +2052,7 @@ void SdXMLGraphicObjectShapeContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
+SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
USHORT nPrefix, const ::rtl::OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
@@ -2118,7 +2064,7 @@ SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
uno::Reference< beans::XPropertySet > xPropSet(mxShape,uno::UNO_QUERY);
if (xPropSet.is())
{
- pContext = new XMLImageMapContext(GetImport(), nPrefix,
+ pContext = new XMLImageMapContext(GetImport(), nPrefix,
rLocalName, xPropSet);
}
}
@@ -2137,7 +2083,7 @@ SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
// delegate to parent class if no context could be created
if ( NULL == pContext )
- pContext = SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName,
+ pContext = SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName,
xAttrList);
return pContext;
@@ -2147,11 +2093,9 @@ SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
SdXMLGraphicObjectShapeContext::~SdXMLGraphicObjectShapeContext()
{
-
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLChartShapeContext, SdXMLShapeContext );
@@ -2278,12 +2222,6 @@ SdXMLObjectShapeContext::~SdXMLObjectShapeContext()
void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
{
- // #96717# in theorie, if we don't have a url we shouldn't even
- // export this ole shape. But practical its to risky right now
- // to change this so we better dispose this on load
- //if( !mbIsPlaceholder && ImpIsEmptyURL(maHref) )
- // return;
-
// #100592# this BugFix prevents that a shape is created. CL
// is thinking about an alternative.
// #i13140# Check for more than empty string in maHref, there are
@@ -2339,13 +2277,13 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen
if( !mbIsPlaceholder && maHref.getLength() )
{
uno::Reference< beans::XPropertySet > xProps( mxShape, uno::UNO_QUERY );
-
+
if( xProps.is() )
{
uno::Any aAny;
OUString aPersistName( GetImport().ResolveEmbeddedObjectURL( maHref, maCLSID ) );
const OUString sURL(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ));
-
+
aAny <<= ( aPersistName = aPersistName.copy( sURL.getLength() ) );
xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ), aAny );
}
@@ -2367,7 +2305,7 @@ void SdXMLObjectShapeContext::EndElement()
{
OUString aPersistName( GetImport().ResolveEmbeddedObjectURL( maHref, OUString() ) );
const OUString sURL(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ));
-
+
aPersistName = aPersistName.copy( sURL.getLength() );
uno::Reference< beans::XPropertySet > xProps(mxShape, uno::UNO_QUERY);
@@ -2384,7 +2322,7 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:
case XML_NAMESPACE_DRAW:
if( IsXMLToken( rLocalName, XML_CLASS_ID ) )
{
- maCLSID = rValue;
+ maCLSID = rValue;
return;
}
break;
@@ -2400,7 +2338,7 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
+SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
USHORT nPrefix, const ::rtl::OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
@@ -2562,7 +2500,7 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT nPrefix
{
OUString aParamName, aParamValue;
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- // now parse the attribute list and look for draw:name and draw:value
+ // now parse the attribute list and look for draw:name and draw:value
for(sal_Int16 a(0); a < nAttrCount; a++)
{
const OUString& rAttrName = xAttrList->getNameByIndex(a);
@@ -2691,7 +2629,7 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT nPrefix
{
OUString aParamName, aParamValue;
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- // now parse the attribute list and look for draw:name and draw:value
+ // now parse the attribute list and look for draw:name and draw:value
for(sal_Int16 a(0); a < nAttrCount; a++)
{
const OUString& rAttrName = xAttrList->getNameByIndex(a);
--
1.7.0.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
