[Libreoffice-commits] .: 2 commits - binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Sun Jan 30 13:13:48 PST 2011
binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx | 56 -
binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx | 23
binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx | 48 -
binfilter/bf_xmloff/source/draw/xmloff_ximp3dscene.cxx | 38
binfilter/bf_xmloff/source/draw/xmloff_ximpgrp.cxx | 18
binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx | 452 ++++------
6 files changed, 269 insertions(+), 366 deletions(-)
New commits:
commit 239b13c874b97a8f0e49e4ce7a017032828021a6
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Sun Jan 30 21:13:41 2011 +0000
Easy hacks: removed double line spacing (and some dead code)
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 b5d8480..c5eda34 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 334f39b..032a044 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 nInPrefix,
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 nInPrefix, const ::r
SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLGraphicObjectShapeContext, SdXMLShapeContext );
@@ -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 nInPrefix, const ::rt
case XML_NAMESPACE_DRAW:
if( IsXMLToken( rLocalName, XML_CLASS_ID ) )
{
- maCLSID = rValue;
+ maCLSID = rValue;
return;
}
break;
@@ -2560,7 +2498,7 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT nInPref
{
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);
@@ -2687,7 +2625,7 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT nInPref
{
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);
commit 66777ba02dacaa2fde01123d2f2d8cc307a479aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 30 21:11:47 2011 +0000
WaE: throw out some warnings
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx
index 8f67a89..db217f7 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx
@@ -45,24 +45,24 @@ using namespace ::com::sun::star;
TYPEINIT1( SdXML3DObjectContext, SdXMLShapeContext );
SdXML3DObjectContext::SdXML3DObjectContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
mbSetTransform( FALSE )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
const SvXMLTokenMap& rAttrTokenMap = GetImport().GetShapeImport()->Get3DObjectAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_3DOBJECT_DRAWSTYLE_NAME:
{
@@ -118,12 +118,12 @@ void SdXML3DObjectContext::EndElement()
TYPEINIT1( SdXML3DCubeObjectShapeContext, SdXML3DObjectContext);
SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXML3DObjectContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
maMinEdge(-2500.0, -2500.0, -2500.0),
maMaxEdge(2500.0, 2500.0, 2500.0),
mbMinEdgeUsed(FALSE),
@@ -133,12 +133,12 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
const SvXMLTokenMap& rAttrTokenMap = GetImport().GetShapeImport()->Get3DCubeObjectAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_3DCUBEOBJ_MINEDGE:
{
@@ -226,12 +226,12 @@ void SdXML3DCubeObjectShapeContext::EndElement()
TYPEINIT1( SdXML3DSphereObjectShapeContext, SdXML3DObjectContext);
SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXML3DObjectContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
maCenter(0.0, 0.0, 0.0),
maSize(5000.0, 5000.0, 5000.0),
mbCenterUsed(FALSE),
@@ -241,12 +241,12 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
const SvXMLTokenMap& rAttrTokenMap = GetImport().GetShapeImport()->Get3DSphereObjectAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_3DSPHEREOBJ_CENTER:
{
@@ -331,23 +331,23 @@ void SdXML3DSphereObjectShapeContext::EndElement()
TYPEINIT1( SdXML3DPolygonBasedShapeContext, SdXML3DObjectContext );
SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXML3DObjectContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
const SvXMLTokenMap& rAttrTokenMap = GetImport().GetShapeImport()->Get3DPolygonBasedAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_3DPOLYGONBASED_VIEWBOX:
{
@@ -449,12 +449,12 @@ void SdXML3DPolygonBasedShapeContext::EndElement()
TYPEINIT1( SdXML3DLatheObjectShapeContext, SdXML3DPolygonBasedShapeContext);
SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXML3DPolygonBasedShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes )
{
}
@@ -490,12 +490,12 @@ void SdXML3DLatheObjectShapeContext::EndElement()
TYPEINIT1( SdXML3DExtrudeObjectShapeContext, SdXML3DPolygonBasedShapeContext);
SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXML3DPolygonBasedShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes )
{
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximp3dscene.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximp3dscene.cxx
index d68406d..e797c9c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximp3dscene.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximp3dscene.cxx
@@ -49,11 +49,11 @@ using namespace ::binfilter::xmloff::token;
// dr3d:3dlight context
SdXML3DLightContext::SdXML3DLightContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList)
-: SvXMLImportContext( rImport, nPrfx, rLName),
+: SvXMLImportContext( rInImport, nPrfx, rLName),
maDiffuseColor(0x00000000),
maDirection(0.0, 0.0, 1.0),
mbEnabled(FALSE),
@@ -64,12 +64,12 @@ SdXML3DLightContext::SdXML3DLightContext(
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
const SvXMLTokenMap& rAttrTokenMap = GetImport().GetShapeImport()->Get3DLightAttrTokenMap();
- switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+ switch(rAttrTokenMap.Get(nLclPrefix, aLclLocalName))
{
case XML_TOK_3DLIGHT_DIFFUSE_COLOR:
{
@@ -104,12 +104,12 @@ SdXML3DLightContext::~SdXML3DLightContext()
TYPEINIT1( SdXML3DSceneShapeContext, SdXMLShapeContext );
SdXML3DSceneShapeContext::SdXML3DSceneShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
USHORT nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), SdXML3DSceneAttributesHelper( rImport )
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ), SdXML3DSceneAttributesHelper( rInImport )
{
}
@@ -145,10 +145,10 @@ void SdXML3DSceneShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
OUString sValue = xAttrList->getValueByIndex( i );
- processSceneAttribute( nPrefix, aLocalName, sValue );
+ processSceneAttribute( nLclPrefix, aLclLocalName, sValue );
}
// #91047# call parent function is missing here, added it
@@ -181,35 +181,35 @@ void SdXML3DSceneShapeContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext* pContext = 0L;
- if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENTS ) )
+ if( nInPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENTS ) )
{
- pContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape );
+ pContext = new SdXMLEventsContext( GetImport(), nInPrefix, rLocalName, xAttrList, mxShape );
}
// look for local light context first
- else if(nPrefix == XML_NAMESPACE_DR3D && IsXMLToken( rLocalName, XML_LIGHT ) )
+ else if(nInPrefix == XML_NAMESPACE_DR3D && IsXMLToken( rLocalName, XML_LIGHT ) )
{
// dr3d:light inside dr3d:scene context
- pContext = create3DLightContext( nPrefix, rLocalName, xAttrList );
+ pContext = create3DLightContext( nInPrefix, rLocalName, xAttrList );
}
// call GroupChildContext function at common ShapeImport
if(!pContext)
{
pContext = GetImport().GetShapeImport()->Create3DSceneChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList, mxChilds);
+ GetImport(), nInPrefix, rLocalName, xAttrList, mxChilds);
}
// call parent when no own context was created
if(!pContext)
{
pContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
+ nInPrefix, rLocalName, xAttrList);
}
return pContext;
@@ -260,9 +260,9 @@ SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uIn
}
/** this should be called for each scene attribute */
-void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_DR3D == nPrefix )
+ if( XML_NAMESPACE_DR3D == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_TRANSFORM ) )
{
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximpgrp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximpgrp.cxx
index 8e38331..e417f11 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximpgrp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximpgrp.cxx
@@ -50,11 +50,11 @@ using ::binfilter::xmloff::token::XML_GLUE_POINT;
TYPEINIT1( SdXMLGroupShapeContext, SvXMLImportContext );
SdXMLGroupShapeContext::SdXMLGroupShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
USHORT nPrfx, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes )
{
}
@@ -66,17 +66,17 @@ SdXMLGroupShapeContext::~SdXMLGroupShapeContext()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext* pContext = 0L;
- if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENTS ) )
+ if( nInPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENTS ) )
{
- pContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape );
+ pContext = new SdXMLEventsContext( GetImport(), nInPrefix, rLocalName, xAttrList, mxShape );
}
- else if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_GLUE_POINT ) )
+ else if( nInPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_GLUE_POINT ) )
{
addGluePoint( xAttrList );
}
@@ -84,20 +84,20 @@ SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( USHORT nPrefix,
{
// call GroupChildContext function at common ShapeImport
pContext = GetImport().GetShapeImport()->CreateGroupChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList, mxChilds);
+ GetImport(), nInPrefix, rLocalName, xAttrList, mxChilds);
}
// call parent when no own context was created
if(!pContext)
pContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
+ nInPrefix, rLocalName, xAttrList);
return pContext;
}
//////////////////////////////////////////////////////////////////////////////
-void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
+void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& /*xAttrList*/)
{
// create new group shape and add it to rShapes, use it
// as base for the new group import
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx
index e6b6869..334f39b 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximpshap.cxx
@@ -133,21 +133,21 @@ static bool ImpIsEmptyURL( const ::rtl::OUString& rURL )
TYPEINIT1( SdXMLShapeContext, SvXMLImportContext );
SdXMLShapeContext::SdXMLShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SvXMLImportContext( rImport, nPrfx, rLocalName ),
+: SvXMLImportContext( rInImport, nPrfx, rLocalName ),
mxShapes( rShapes ),
+ mxAttrList(xAttrList),
mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID),
mbIsPlaceholder(FALSE),
mbIsUserTransformed(FALSE),
- mxAttrList(xAttrList),
mnZOrder(-1),
mnShapeId(-1),
- maPosition(0, 0),
- maSize(1, 1)
+ maSize(1, 1),
+ maPosition(0, 0)
{
}
@@ -183,33 +183,33 @@ SdXMLShapeContext::~SdXMLShapeContext()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext * pContext = NULL;
- if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENTS ) )
+ if( nInPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENTS ) )
{
- pContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape );
+ pContext = new SdXMLEventsContext( GetImport(), nInPrefix, rLocalName, xAttrList, mxShape );
}
- else if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_GLUE_POINT ) )
+ else if( nInPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_GLUE_POINT ) )
{
addGluePoint( xAttrList );
}
- else if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_THUMBNAIL ) )
+ else if( nInPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_THUMBNAIL ) )
{
// search attributes for xlink:href
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- if( nPrefix == XML_NAMESPACE_XLINK )
+ if( nLclPrefix == XML_NAMESPACE_XLINK )
{
- if( IsXMLToken( aLocalName, XML_HREF ) )
+ if( IsXMLToken( aLclLocalName, XML_HREF ) )
{
maThumbnailURL = xAttrList->getValueByIndex( i );
break;
@@ -247,13 +247,13 @@ SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT nPrefix,
if( mxCursor.is() )
{
pContext = GetImport().GetTextImport()->CreateTextChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList );
+ GetImport(), nInPrefix, rLocalName, xAttrList );
}
}
// call parent for content
if(!pContext)
- pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ pContext = SvXMLImportContext::CreateChildContext( nInPrefix, rLocalName, xAttrList );
return pContext;
}
@@ -288,28 +288,28 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
for(sal_Int16 i=0; i < nAttrCount; i++)
{
OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
const OUString sValue( xAttrList->getValueByIndex( i ) );
- if( nPrefix == XML_NAMESPACE_SVG )
+ if( nLclPrefix == XML_NAMESPACE_SVG )
{
- if( IsXMLToken( aLocalName, XML_X ) )
+ if( IsXMLToken( aLclLocalName, XML_X ) )
{
GetImport().GetMM100UnitConverter().convertMeasure(aGluePoint.Position.X, sValue);
}
- else if( IsXMLToken( aLocalName, XML_Y ) )
+ else if( IsXMLToken( aLclLocalName, XML_Y ) )
{
GetImport().GetMM100UnitConverter().convertMeasure(aGluePoint.Position.Y, sValue);
}
}
- else if( nPrefix == XML_NAMESPACE_DRAW )
+ else if( nLclPrefix == XML_NAMESPACE_DRAW )
{
- if( IsXMLToken( aLocalName, XML_ID ) )
+ if( IsXMLToken( aLclLocalName, XML_ID ) )
{
nId = sValue.toInt32();
}
- else if( IsXMLToken( aLocalName, XML_ALIGN ) )
+ else if( IsXMLToken( aLclLocalName, XML_ALIGN ) )
{
USHORT eKind;
if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueAlignment_EnumMap ) )
@@ -318,7 +318,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
aGluePoint.IsRelative = sal_False;
}
}
- else if( IsXMLToken( aLocalName, XML_ESCAPE_DIRECTION ) )
+ else if( IsXMLToken( aLclLocalName, XML_ESCAPE_DIRECTION ) )
{
USHORT eKind;
if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueEscapeDirection_EnumMap ) )
@@ -344,7 +344,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
}
//////////////////////////////////////////////////////////////////////////////
-void SdXMLShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
+void SdXMLShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& /*xAttrList*/)
{
GetImport().GetShapeImport()->finishShape( mxShape, mxAttrList, mxShapes );
}
@@ -662,9 +662,9 @@ void SdXMLShapeContext::SetThumbnail()
}
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_DRAW == nPrefix )
+ if( XML_NAMESPACE_DRAW == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_ZINDEX ) )
{
@@ -695,7 +695,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUStr
mnTransform.SetString(rValue, GetImport().GetMM100UnitConverter());
}
}
- else if( XML_NAMESPACE_PRESENTATION == nPrefix )
+ else if( XML_NAMESPACE_PRESENTATION == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_USER_TRANSFORMED ) )
{
@@ -715,7 +715,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUStr
mnStyleFamily = XML_STYLE_FAMILY_SD_PRESENTATION_ID;
}
}
- else if( XML_NAMESPACE_SVG == nPrefix )
+ else if( XML_NAMESPACE_SVG == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_X ) )
{
@@ -756,12 +756,12 @@ sal_Bool SdXMLShapeContext::isPresentationShape() const
TYPEINIT1( SdXMLRectShapeContext, SdXMLShapeContext );
SdXMLRectShapeContext::SdXMLRectShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
mnRadius( 0L )
{
}
@@ -775,9 +775,9 @@ SdXMLRectShapeContext::~SdXMLRectShapeContext()
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLRectShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_DRAW == nPrefix )
+ if( XML_NAMESPACE_DRAW == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_CORNER_RADIUS ) )
{
@@ -786,7 +786,7 @@ void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::O
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -829,12 +829,12 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
TYPEINIT1( SdXMLLineShapeContext, SdXMLShapeContext );
SdXMLLineShapeContext::SdXMLLineShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
mnX1( 0L ),
mnY1( 0L ),
mnX2( 1L ),
@@ -851,9 +851,9 @@ SdXMLLineShapeContext::~SdXMLLineShapeContext()
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLLineShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_SVG == nPrefix )
+ if( XML_NAMESPACE_SVG == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_X1 ) )
{
@@ -877,7 +877,7 @@ void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::O
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -950,12 +950,12 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
TYPEINIT1( SdXMLEllipseShapeContext, SdXMLShapeContext );
SdXMLEllipseShapeContext::SdXMLEllipseShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
mnCX( 0L ),
mnCY( 0L ),
mnRX( 1L ),
@@ -975,9 +975,9 @@ SdXMLEllipseShapeContext::~SdXMLEllipseShapeContext()
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_SVG == nPrefix )
+ if( XML_NAMESPACE_SVG == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_RX ) )
{
@@ -1007,7 +1007,7 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
return;
}
}
- else if( XML_NAMESPACE_DRAW == nPrefix )
+ else if( XML_NAMESPACE_DRAW == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_KIND ) )
{
@@ -1034,7 +1034,7 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -1079,12 +1079,12 @@ void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
TYPEINIT1( SdXMLPolygonShapeContext, SdXMLShapeContext );
SdXMLPolygonShapeContext::SdXMLPolygonShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes, sal_Bool bClosed)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
mbClosed( bClosed )
{
}
@@ -1092,9 +1092,9 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext(
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_SVG == nPrefix )
+ if( XML_NAMESPACE_SVG == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_VIEWBOX ) )
{
@@ -1102,7 +1102,7 @@ void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
return;
}
}
- else if( XML_NAMESPACE_DRAW == nPrefix )
+ else if( XML_NAMESPACE_DRAW == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_POINTS ) )
{
@@ -1111,7 +1111,7 @@ void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -1168,12 +1168,12 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
TYPEINIT1( SdXMLPathShapeContext, SdXMLShapeContext );
SdXMLPathShapeContext::SdXMLPathShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
mbClosed( TRUE )
{
}
@@ -1187,9 +1187,9 @@ SdXMLPathShapeContext::~SdXMLPathShapeContext()
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLPathShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_SVG == nPrefix )
+ if( XML_NAMESPACE_SVG == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_VIEWBOX ) )
{
@@ -1203,7 +1203,7 @@ void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::O
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -1220,7 +1220,7 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
SdXMLImExSvgDElement aPoints(maD, aViewBox,
aPosition, aSize, GetImport().GetMM100UnitConverter());
- char* pService;
+ const char* pService;
// now create shape
if(aPoints.IsCurve())
{
@@ -1298,12 +1298,12 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
TYPEINIT1( SdXMLTextBoxShapeContext, SdXMLShapeContext );
SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
mnRadius(0)
{
}
@@ -1317,9 +1317,9 @@ SdXMLTextBoxShapeContext::~SdXMLTextBoxShapeContext()
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_DRAW == nPrefix )
+ if( XML_NAMESPACE_DRAW == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_CORNER_RADIUS ) )
{
@@ -1328,7 +1328,7 @@ void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -1338,7 +1338,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
// create textbox shape
sal_Bool bIsPresShape(FALSE);
- char *pService = NULL;
+ const char *pService = NULL;
if( isPresentationShape() )
{
@@ -1439,12 +1439,12 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
TYPEINIT1( SdXMLControlShapeContext, SdXMLShapeContext );
SdXMLControlShapeContext::SdXMLControlShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes )
{
}
@@ -1457,9 +1457,9 @@ SdXMLControlShapeContext::~SdXMLControlShapeContext()
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLControlShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_FORM == nPrefix )
+ if( XML_NAMESPACE_FORM == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_ID ) )
{
@@ -1468,7 +1468,7 @@ void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
@@ -1512,12 +1512,12 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
TYPEINIT1( SdXMLConnectorShapeContext, SdXMLShapeContext );
SdXMLConnectorShapeContext::SdXMLConnectorShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
maStart(0,0),
maEnd(1,1),
mnType( (USHORT)drawing::ConnectorType_STANDARD ),
@@ -1540,9 +1540,9 @@ SdXMLConnectorShapeContext::~SdXMLConnectorShapeContext()
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- switch( nPrefix )
+ switch( nInPrefix )
{
case XML_NAMESPACE_DRAW:
{
@@ -1615,7 +1615,7 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const ::r
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -1689,12 +1689,12 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA
TYPEINIT1( SdXMLMeasureShapeContext, SdXMLShapeContext );
SdXMLMeasureShapeContext::SdXMLMeasureShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
maStart(0,0),
maEnd(1,1)
{
@@ -1707,9 +1707,9 @@ SdXMLMeasureShapeContext::~SdXMLMeasureShapeContext()
}
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- switch( nPrefix )
+ switch( nInPrefix )
{
case XML_NAMESPACE_SVG:
{
@@ -1736,7 +1736,7 @@ void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -1802,12 +1802,12 @@ void SdXMLMeasureShapeContext::EndElement()
TYPEINIT1( SdXMLPageShapeContext, SdXMLShapeContext );
SdXMLPageShapeContext::SdXMLPageShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), mnPageNumber(0)
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ), mnPageNumber(0)
{
}
@@ -1820,9 +1820,9 @@ SdXMLPageShapeContext::~SdXMLPageShapeContext()
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLPageShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_DRAW == nPrefix )
+ if( XML_NAMESPACE_DRAW == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_PAGE_NUMBER ) )
{
@@ -1831,7 +1831,7 @@ void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::O
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -1897,12 +1897,12 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
TYPEINIT1( SdXMLCaptionShapeContext, SdXMLShapeContext );
SdXMLCaptionShapeContext::SdXMLCaptionShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
// #86616# for correct edge rounding import mnRadius needs to be initialized
mnRadius( 0L )
{
@@ -1954,9 +1954,9 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_DRAW == nPrefix )
+ if( XML_NAMESPACE_DRAW == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_CAPTION_POINT_X ) )
{
@@ -1974,7 +1974,7 @@ void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
return;
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1983,12 +1983,12 @@ void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
TYPEINIT1( SdXMLGraphicObjectShapeContext, SdXMLShapeContext );
SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
maURL()
{
}
@@ -1996,9 +1996,9 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext(
//////////////////////////////////////////////////////////////////////////////
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if( XML_NAMESPACE_XLINK == nPrefix )
+ if( XML_NAMESPACE_XLINK == nInPrefix )
{
if( IsXMLToken( rLocalName, XML_HREF ) )
{
@@ -2007,7 +2007,7 @@ void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const
}
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
//////////////////////////////////////////////////////////////////////////////
@@ -2015,7 +2015,7 @@ void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const
void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
{
// create graphic object shape
- char *pService;
+ const char *pService;
if( IsXMLToken( maPresentationClass, XML_GRAPHIC ) && GetImport().GetShapeImport()->IsPresentationShapesSupported() )
{
@@ -2059,14 +2059,14 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::
if(mbIsUserTransformed)
{
- uno::Reference< beans::XPropertySet > xProps(mxShape, uno::UNO_QUERY);
- if(xProps.is())
+ uno::Reference< beans::XPropertySet > xLclProps(mxShape, uno::UNO_QUERY);
+ if(xLclProps.is())
{
- uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() );
+ uno::Reference< beans::XPropertySetInfo > xPropsInfo( xLclProps->getPropertySetInfo() );
if( xPropsInfo.is() )
{
if( xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") )))
- xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) );
+ xLclProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) );
}
}
}
@@ -2107,29 +2107,29 @@ void SdXMLGraphicObjectShapeContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
- USHORT nPrefix, const ::rtl::OUString& rLocalName,
+ USHORT nInPrefix, const ::rtl::OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext* pContext = NULL;
- if ( (XML_NAMESPACE_DRAW == nPrefix) &&
+ if ( (XML_NAMESPACE_DRAW == nInPrefix) &&
IsXMLToken( rLocalName, XML_IMAGE_MAP ) )
{
uno::Reference< beans::XPropertySet > xPropSet(mxShape,uno::UNO_QUERY);
if (xPropSet.is())
{
- pContext = new XMLImageMapContext(GetImport(), nPrefix,
+ pContext = new XMLImageMapContext(GetImport(), nInPrefix,
rLocalName, xPropSet);
}
}
- else if( (XML_NAMESPACE_OFFICE == nPrefix) &&
+ else if( (XML_NAMESPACE_OFFICE == nInPrefix) &&
xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) )
{
if( !maURL.getLength() && !mxBase64Stream.is() )
{
mxBase64Stream = GetImport().GetStreamForGraphicObjectURLFromBase64();
if( mxBase64Stream.is() )
- pContext = new XMLBase64ImportContext( GetImport(), nPrefix,
+ pContext = new XMLBase64ImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
mxBase64Stream );
}
@@ -2137,7 +2137,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(nInPrefix, rLocalName,
xAttrList);
return pContext;
@@ -2156,12 +2156,12 @@ SdXMLGraphicObjectShapeContext::~SdXMLGraphicObjectShapeContext()
TYPEINIT1( SdXMLChartShapeContext, SdXMLShapeContext );
SdXMLChartShapeContext::SdXMLChartShapeContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
mpChartContext( NULL )
{
}
@@ -2251,11 +2251,11 @@ void SdXMLChartShapeContext::Characters( const ::rtl::OUString& rChars )
mpChartContext->Characters( rChars );
}
-SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( USHORT nInPrefix, const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
if( mpChartContext )
- return mpChartContext->CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return mpChartContext->CreateChildContext( nInPrefix, rLocalName, xAttrList );
return NULL;
}
@@ -2264,11 +2264,11 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( USHORT nPrefix,
TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext );
-SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes )
{
}
@@ -2276,7 +2276,7 @@ SdXMLObjectShapeContext::~SdXMLObjectShapeContext()
{
}
-void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
+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
@@ -2292,7 +2292,7 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen
if( !(GetImport().getImportFlags() & IMPORT_EMBEDDED) && !mbIsPlaceholder && ImpIsEmptyURL(maHref) )
return;
- char* pService = "com.sun.star.drawing.OLE2Shape";
+ const char* pService = "com.sun.star.drawing.OLE2Shape";
sal_Bool bIsPresShape = maPresentationClass.getLength() && GetImport().GetShapeImport()->IsPresentationShapesSupported();
;
@@ -2377,9 +2377,9 @@ void SdXMLObjectShapeContext::EndElement()
}
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- switch( nPrefix )
+ switch( nInPrefix )
{
case XML_NAMESPACE_DRAW:
if( IsXMLToken( rLocalName, XML_CLASS_ID ) )
@@ -2397,30 +2397,30 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:
break;
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
- USHORT nPrefix, const ::rtl::OUString& rLocalName,
+ USHORT nInPrefix, const ::rtl::OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
// #100592#
SvXMLImportContext* pContext = NULL;
- if((XML_NAMESPACE_OFFICE == nPrefix) && IsXMLToken(rLocalName, XML_BINARY_DATA))
+ if((XML_NAMESPACE_OFFICE == nInPrefix) && IsXMLToken(rLocalName, XML_BINARY_DATA))
{
maHref = OUString( RTL_CONSTASCII_USTRINGPARAM( "#Obj12345678" ) );
mxBase64Stream = GetImport().ResolveEmbeddedObjectURLFromBase64( maHref );
if( mxBase64Stream.is() )
- pContext = new XMLBase64ImportContext( GetImport(), nPrefix,
+ pContext = new XMLBase64ImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
mxBase64Stream );
}
- else if( ((XML_NAMESPACE_OFFICE == nPrefix) && IsXMLToken(rLocalName, XML_DOCUMENT)) ||
- ((XML_NAMESPACE_MATH == nPrefix) && IsXMLToken(rLocalName, XML_MATH)) )
+ else if( ((XML_NAMESPACE_OFFICE == nInPrefix) && IsXMLToken(rLocalName, XML_DOCUMENT)) ||
+ ((XML_NAMESPACE_MATH == nInPrefix) && IsXMLToken(rLocalName, XML_MATH)) )
{
XMLEmbeddedObjectImportContext *pEContext =
- new XMLEmbeddedObjectImportContext( GetImport(), nPrefix,
+ new XMLEmbeddedObjectImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList );
maCLSID = pEContext->GetFilterCLSID();
if( maCLSID.getLength() != 0 )
@@ -2441,7 +2441,7 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
// delegate to parent class if no context could be created
if(!pContext)
- pContext = SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
+ pContext = SdXMLShapeContext::CreateChildContext(nInPrefix, rLocalName, xAttrList);
return pContext;
}
@@ -2450,11 +2450,11 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext );
-SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes ),
mbIsScript( sal_False )
{
}
@@ -2463,9 +2463,9 @@ SdXMLAppletShapeContext::~SdXMLAppletShapeContext()
{
}
-void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
+void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& /*xAttrList*/)
{
- char* pService = "com.sun.star.drawing.AppletShape";
+ const char* pService = "com.sun.star.drawing.AppletShape";
AddShape( pService );
if( mxShape.is() )
@@ -2479,9 +2479,9 @@ void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Referen
}
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- switch( nPrefix )
+ switch( nInPrefix )
{
case XML_NAMESPACE_DRAW:
if( IsXMLToken( rLocalName, XML_APPLET_NAME ) )
@@ -2509,7 +2509,7 @@ void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:
break;
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
void SdXMLAppletShapeContext::EndElement()
@@ -2554,11 +2554,9 @@ void SdXMLAppletShapeContext::EndElement()
}
}
-SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT nInPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
- SvXMLImportContext * pContext = NULL;
-
- if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
+ if( nInPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
{
OUString aParamName, aParamValue;
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -2566,17 +2564,17 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT nPrefix
for(sal_Int16 a(0); a < nAttrCount; a++)
{
const OUString& rAttrName = xAttrList->getNameByIndex(a);
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLclLocalName);
const OUString aValue( xAttrList->getValueByIndex(a) );
- if( nPrefix == XML_NAMESPACE_DRAW )
+ if( nLclPrefix == XML_NAMESPACE_DRAW )
{
- if( IsXMLToken( aLocalName, XML_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_NAME ) )
{
aParamName = aValue;
}
- else if( IsXMLToken( aLocalName, XML_VALUE ) )
+ else if( IsXMLToken( aLclLocalName, XML_VALUE ) )
{
aParamValue = aValue;
}
@@ -2593,21 +2591,21 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT nPrefix
maParams[nIndex].State = beans::PropertyState_DIRECT_VALUE;
}
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
- return SdXMLShapeContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return SdXMLShapeContext::CreateChildContext( nInPrefix, rLocalName, xAttrList );
}
//////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext );
-SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes )
{
}
@@ -2615,9 +2613,9 @@ SdXMLPluginShapeContext::~SdXMLPluginShapeContext()
{
}
-void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
+void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& /*xAttrList*/ )
{
- char* pService = "com.sun.star.drawing.PluginShape";
+ const char* pService = "com.sun.star.drawing.PluginShape";
AddShape( pService );
if( mxShape.is() )
@@ -2631,9 +2629,9 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen
}
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- switch( nPrefix )
+ switch( nInPrefix )
{
case XML_NAMESPACE_DRAW:
if( IsXMLToken( rLocalName, XML_MIME_TYPE ) )
@@ -2651,7 +2649,7 @@ void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:
break;
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
void SdXMLPluginShapeContext::EndElement()
@@ -2683,11 +2681,9 @@ void SdXMLPluginShapeContext::EndElement()
}
}
-SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT nInPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
- SvXMLImportContext * pContext = NULL;
-
- if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
+ if( nInPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
{
OUString aParamName, aParamValue;
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -2695,17 +2691,17 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT nPrefix
for(sal_Int16 a(0); a < nAttrCount; a++)
{
const OUString& rAttrName = xAttrList->getNameByIndex(a);
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLclLocalName);
const OUString aValue( xAttrList->getValueByIndex(a) );
- if( nPrefix == XML_NAMESPACE_DRAW )
+ if( nLclPrefix == XML_NAMESPACE_DRAW )
{
- if( IsXMLToken( aLocalName, XML_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_NAME ) )
{
aParamName = aValue;
}
- else if( IsXMLToken( aLocalName, XML_VALUE ) )
+ else if( IsXMLToken( aLclLocalName, XML_VALUE ) )
{
aParamValue = aValue;
}
@@ -2722,21 +2718,21 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT nPrefix
}
}
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
- return SdXMLShapeContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return SdXMLShapeContext::CreateChildContext( nInPrefix, rLocalName, xAttrList );
}
//////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext );
-SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXMLShapeContext( rInImport, nPrfx, rLocalName, xAttrList, rShapes )
{
}
@@ -2744,9 +2740,9 @@ SdXMLFrameShapeContext::~SdXMLFrameShapeContext()
{
}
-void SdXMLFrameShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
+void SdXMLFrameShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& /*xAttrList*/ )
{
- char* pService = "com.sun.star.drawing.FrameShape";
+ const char* pService = "com.sun.star.drawing.FrameShape";
AddShape( pService );
if( mxShape.is() )
@@ -2781,9 +2777,9 @@ void SdXMLFrameShapeContext::StartElement( const ::com::sun::star::uno::Referenc
}
// this is called from the parent group for each unparsed attribute in the attribute list
-void SdXMLFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+void SdXMLFrameShapeContext::processAttribute( sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- switch( nPrefix )
+ switch( nInPrefix )
{
case XML_NAMESPACE_DRAW:
if( IsXMLToken( rLocalName, XML_FRAME_NAME ) )
@@ -2801,7 +2797,7 @@ void SdXMLFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::
break;
}
- SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
+ SdXMLShapeContext::processAttribute( nInPrefix, rLocalName, rValue );
}
void SdXMLFrameShapeContext::EndElement()
More information about the Libreoffice-commits
mailing list