[Libreoffice-commits] core.git: include/xmloff xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sat Nov 21 14:22:51 UTC 2020
include/xmloff/shapeimport.hxx | 3 -
xmloff/source/draw/shapeimport.cxx | 58 +++++++++++------------
xmloff/source/draw/ximp3dobject.cxx | 24 ++-------
xmloff/source/draw/ximp3dobject.hxx | 17 ++----
xmloff/source/draw/ximp3dscene.cxx | 4 -
xmloff/source/draw/ximp3dscene.hxx | 2
xmloff/source/draw/ximpgrp.cxx | 3 -
xmloff/source/draw/ximpgrp.hxx | 2
xmloff/source/draw/ximplink.cxx | 4 -
xmloff/source/draw/ximplink.hxx | 2
xmloff/source/draw/ximpshap.cxx | 89 ++++++++++--------------------------
xmloff/source/draw/ximpshap.hxx | 61 ++++++++----------------
12 files changed, 94 insertions(+), 175 deletions(-)
New commits:
commit fc828fb382cc187ab645b00b8f780fbdab2ceed3
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Nov 21 11:55:28 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Nov 21 15:22:08 2020 +0100
remove some prefix and local params from constructors
Change-Id: Iaffbefe98ced97610b99a00b1b3011c6a79a7859
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106300
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 1dcb16ebe4e6..b4bc6bf44c3a 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -201,8 +201,7 @@ protected:
OUString msHyperlink;
public:
- SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
- const OUString& rLName, bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {}
+ SvXMLShapeContext( SvXMLImport& rImp, bool bTemporaryShape ) : SvXMLImportContext( rImp ), mbTemporaryShape(bTemporaryShape) {}
const css::uno::Reference< css::drawing::XShape >& getShape() const { return mxShape; }
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 47309a3ab28f..2a2d5e137eb4 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -359,31 +359,31 @@ SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext(
case XML_TOK_3DSCENE_3DSCENE:
{
// dr3d:3dscene inside dr3d:3dscene context
- pContext = new SdXML3DSceneShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false);
+ pContext = new SdXML3DSceneShapeContext( rImport, xAttrList, rShapes, false);
break;
}
case XML_TOK_3DSCENE_3DCUBE:
{
// dr3d:3dcube inside dr3d:3dscene context
- pContext = new SdXML3DCubeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DCubeObjectShapeContext( rImport, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DSPHERE:
{
// dr3d:3dsphere inside dr3d:3dscene context
- pContext = new SdXML3DSphereObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DSphereObjectShapeContext( rImport, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DLATHE:
{
// dr3d:3dlathe inside dr3d:3dscene context
- pContext = new SdXML3DLatheObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DLatheObjectShapeContext( rImport, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DEXTRUDE:
{
// dr3d:3dextrude inside dr3d:3dscene context
- pContext = new SdXML3DExtrudeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DExtrudeObjectShapeContext( rImport, xAttrList, rShapes);
break;
}
}
@@ -435,104 +435,104 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
case XML_TOK_GROUP_GROUP:
{
// draw:g inside group context (RECURSIVE)
- pContext = new SdXMLGroupShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape);
+ pContext = new SdXMLGroupShapeContext( rImport, xAttrList, rShapes, bTemporaryShape);
break;
}
case XML_TOK_GROUP_3DSCENE:
{
// dr3d:3dscene inside group context
- pContext = new SdXML3DSceneShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape);
+ pContext = new SdXML3DSceneShapeContext( rImport, xAttrList, rShapes, bTemporaryShape);
break;
}
case XML_TOK_GROUP_RECT:
{
// draw:rect inside group context
- pContext = new SdXMLRectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLRectShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_LINE:
{
// draw:line inside group context
- pContext = new SdXMLLineShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLLineShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_CIRCLE:
case XML_TOK_GROUP_ELLIPSE:
{
// draw:circle or draw:ellipse inside group context
- pContext = new SdXMLEllipseShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLEllipseShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_POLYGON:
case XML_TOK_GROUP_POLYLINE:
{
// draw:polygon or draw:polyline inside group context
- pContext = new SdXMLPolygonShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes,
+ pContext = new SdXMLPolygonShapeContext( rImport, xAttrList, rShapes,
rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON, bTemporaryShape );
break;
}
case XML_TOK_GROUP_PATH:
{
// draw:path inside group context
- pContext = new SdXMLPathShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape);
+ pContext = new SdXMLPathShapeContext( rImport, xAttrList, rShapes, bTemporaryShape);
break;
}
case XML_TOK_GROUP_FRAME:
{
// text:text-box inside group context
- pContext = new SdXMLFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLFrameShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_CONTROL:
{
// draw:control inside group context
- pContext = new SdXMLControlShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLControlShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_CONNECTOR:
{
// draw:connector inside group context
- pContext = new SdXMLConnectorShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLConnectorShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_MEASURE:
{
// draw:measure inside group context
- pContext = new SdXMLMeasureShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLMeasureShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_PAGE:
{
// draw:page inside group context
- pContext = new SdXMLPageShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLPageShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_CAPTION:
case XML_TOK_GROUP_ANNOTATION:
{
// draw:caption inside group context
- pContext = new SdXMLCaptionShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLCaptionShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_CHART:
{
// chart:chart inside group context
- pContext = new SdXMLChartShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, bTemporaryShape );
+ pContext = new SdXMLChartShapeContext( rImport, xAttrList, rShapes, bTemporaryShape );
break;
}
case XML_TOK_GROUP_CUSTOM_SHAPE:
{
// draw:customshape
- pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLCustomShapeContext( rImport, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_A:
{
- return new SdXMLShapeLinkContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
+ return new SdXMLShapeLinkContext( rImport, xAttrList, rShapes );
}
// add other shapes here...
default:
- return new SvXMLShapeContext( rImport, p_nPrefix, rLocalName, bTemporaryShape );
+ return new SvXMLShapeContext( rImport, bTemporaryShape );
}
// now parse the attribute list and call the child context for each unknown attribute
@@ -572,46 +572,46 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
case XML_TOK_FRAME_TEXT_BOX:
{
// text:text-box inside group context
- pContext = new SdXMLTextBoxShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLTextBoxShapeContext( rImport, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_IMAGE:
{
// office:image inside group context
- pContext = new SdXMLGraphicObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLGraphicObjectShapeContext( rImport, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_OBJECT:
case XML_TOK_FRAME_OBJECT_OLE:
{
// draw:object or draw:object_ole
- pContext = new SdXMLObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLObjectShapeContext( rImport, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_TABLE:
{
// draw:object or draw:object_ole
if( rImport.IsTableShapeSupported() )
- pContext = new SdXMLTableShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLTableShapeContext( rImport, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_PLUGIN:
{
// draw:plugin
- pContext = new SdXMLPluginShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLPluginShapeContext( rImport, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_FLOATING_FRAME:
{
// draw:floating-frame
- pContext = new SdXMLFloatingFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLFloatingFrameShapeContext( rImport, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_APPLET:
{
// draw:applet
- pContext = new SdXMLAppletShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLAppletShapeContext( rImport, xAttrList, rShapes );
break;
}
// add other shapes here...
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index 22ffddffea7d..00d0ca472050 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -34,11 +34,9 @@ using namespace ::com::sun::star;
SdXML3DObjectContext::SdXML3DObjectContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, false/*bTemporaryShape*/ ),
mbSetTransform( false )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -90,11 +88,9 @@ void SdXML3DObjectContext::StartElement(const uno::Reference< xml::sax::XAttribu
SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes)
-: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXML3DObjectContext( rImport, xAttrList, rShapes ),
maMinEdge(-2500.0, -2500.0, -2500.0),
maMaxEdge(2500.0, 2500.0, 2500.0)
{
@@ -172,11 +168,9 @@ void SdXML3DCubeObjectShapeContext::StartElement(const uno::Reference< xml::sax:
SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes)
-: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
+: SdXML3DObjectContext( rImport, xAttrList, rShapes ),
maCenter(0.0, 0.0, 0.0),
maSphereSize(5000.0, 5000.0, 5000.0)
{
@@ -251,11 +245,9 @@ void SdXML3DSphereObjectShapeContext::StartElement(const uno::Reference< xml::sa
SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes)
-: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXML3DObjectContext( rImport, xAttrList, rShapes )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -328,11 +320,9 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa
SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes)
-: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXML3DPolygonBasedShapeContext( rImport, xAttrList, rShapes )
{
}
@@ -354,11 +344,9 @@ void SdXML3DLatheObjectShapeContext::StartElement(const uno::Reference< xml::sax
SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes)
-: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
+: SdXML3DPolygonBasedShapeContext( rImport, xAttrList, rShapes )
{
}
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index 5aad793478b7..5beca9c2ff97 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -36,8 +36,6 @@ class SdXML3DObjectContext : public SdXMLShapeContext
public:
SdXML3DObjectContext( SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXML3DObjectContext() override;
@@ -54,8 +52,7 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext
public:
- SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXML3DCubeObjectShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXML3DCubeObjectShapeContext() override;
@@ -72,8 +69,7 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext
public:
- SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXML3DSphereObjectShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXML3DSphereObjectShapeContext() override;
@@ -90,8 +86,7 @@ class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext
public:
- SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXML3DPolygonBasedShapeContext() override;
@@ -105,8 +100,7 @@ class SdXML3DLatheObjectShapeContext : public SdXML3DPolygonBasedShapeContext
{
public:
- SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXML3DLatheObjectShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXML3DLatheObjectShapeContext() override;
@@ -120,8 +114,7 @@ class SdXML3DExtrudeObjectShapeContext : public SdXML3DPolygonBasedShapeContext
{
public:
- SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXML3DExtrudeObjectShapeContext() override;
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 58a55c578101..247dca10bfb2 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -94,12 +94,10 @@ SdXML3DLightContext::~SdXML3DLightContext()
SdXML3DSceneShapeContext::SdXML3DSceneShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShapes ), SdXML3DSceneAttributesHelper( rImport )
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShapes ), SdXML3DSceneAttributesHelper( rImport )
{
}
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index d8eb32a3e4a4..2b8f15705d36 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -36,8 +36,6 @@ public:
SdXML3DSceneShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index c6d7d12c2843..8eda3df0697a 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -30,11 +30,10 @@ using namespace ::xmloff::token;
SdXMLGroupShapeContext::SdXMLGroupShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape )
{
}
diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index db8344a026e4..dfa2478c8ac2 100644
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -33,7 +33,7 @@ class SdXMLGroupShapeContext : public SdXMLShapeContext
public:
- SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
+ SdXMLGroupShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 63121a8284f0..08049faac123 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -26,8 +26,8 @@ using namespace ::com::sun::star;
using namespace ::xmloff::token;
-SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes > const & rShapes)
-: SvXMLShapeContext( rImport, nPrfx, rLocalName, false )
+SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes > const & rShapes)
+: SvXMLShapeContext( rImport, false )
, mxParent( rShapes )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index e3b42ff9f6c5..d5d075a2f993 100644
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -36,7 +36,7 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext
public:
- SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
+ SdXMLShapeLinkContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXMLShapeLinkContext() override;
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 7558ff5e0c62..65a7e2fb0eef 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -141,12 +141,10 @@ static bool ImpIsEmptyURL( const OUString& rURL )
SdXMLShapeContext::SdXMLShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
- : SvXMLShapeContext( rImport, nPrfx, rLocalName, bTemporaryShape )
+ : SvXMLShapeContext( rImport, bTemporaryShape )
, mxShapes( rShapes )
, mxAttrList(xAttrList)
, mbListContextPushed( false )
@@ -944,12 +942,10 @@ bool SdXMLShapeContext::isPresentationShape() const
SdXMLRectShapeContext::SdXMLRectShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape ),
mnRadius( 0 )
{
}
@@ -1009,12 +1005,10 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
SdXMLLineShapeContext::SdXMLLineShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape ),
mnX1( 0 ),
mnY1( 0 ),
mnX2( 1 ),
@@ -1122,12 +1116,10 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
SdXMLEllipseShapeContext::SdXMLEllipseShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape ),
mnCX( 0 ),
mnCY( 0 ),
mnRX( 1 ),
@@ -1246,11 +1238,9 @@ void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
SdXMLPolygonShapeContext::SdXMLPolygonShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes, bool bClosed, bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape ),
mbClosed( bClosed )
{
}
@@ -1355,12 +1345,10 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
SdXMLPathShapeContext::SdXMLPathShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape )
{
}
@@ -1508,11 +1496,9 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, false/*bTemporaryShape*/ ),
mnRadius(0),
maChainNextName("")
{
@@ -1696,12 +1682,10 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
SdXMLControlShapeContext::SdXMLControlShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape )
{
}
@@ -1760,12 +1744,10 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
SdXMLConnectorShapeContext::SdXMLConnectorShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape ),
maStart(0,0),
maEnd(1,1),
mnType( drawing::ConnectorType_STANDARD ),
@@ -2066,12 +2048,10 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA
SdXMLMeasureShapeContext::SdXMLMeasureShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape ),
maStart(0,0),
maEnd(1,1)
{
@@ -2171,12 +2151,10 @@ void SdXMLMeasureShapeContext::endFastElement(sal_Int32 nElement)
SdXMLPageShapeContext::SdXMLPageShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnPageNumber(0)
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape ), mnPageNumber(0)
{
mbClearDefaultAttributes = false;
}
@@ -2258,12 +2236,10 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
SdXMLCaptionShapeContext::SdXMLCaptionShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape ),
// #86616# for correct edge rounding import mnRadius needs to be initialized
mnRadius( 0 )
{
@@ -2358,11 +2334,9 @@ void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr
SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, false/*bTemporaryShape*/ ),
maURL()
{
}
@@ -2509,12 +2483,10 @@ SdXMLGraphicObjectShapeContext::~SdXMLGraphicObjectShapeContext()
SdXMLChartShapeContext::SdXMLChartShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape )
{
}
@@ -2602,11 +2574,10 @@ SvXMLImportContextRef SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPr
}
-SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
+: SdXMLShapeContext( rImport, xAttrList, rShapes, false/*bTemporaryShape*/ )
{
}
@@ -2812,11 +2783,10 @@ SvXMLImportContextRef SdXMLObjectShapeContext::CreateChildContext(
return xContext;
}
-SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, false/*bTemporaryShape*/ ),
mbIsScript( false )
{
}
@@ -2963,11 +2933,10 @@ SvXMLImportContextRef SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_
}
-SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes) :
-SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
+SdXMLShapeContext( rImport, xAttrList, rShapes, false/*bTemporaryShape*/ ),
mbMedia( false )
{
}
@@ -3229,11 +3198,10 @@ SvXMLImportContextRef SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_
}
-SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
+: SdXMLShapeContext( rImport, xAttrList, rShapes, false/*bTemporaryShape*/ )
{
}
@@ -3315,12 +3283,11 @@ void SdXMLFloatingFrameShapeContext::endFastElement(sal_Int32 nElement)
}
-SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+: SdXMLShapeContext( rImport, xAttrList, rShapes, bTemporaryShape ),
MultiImageImportHelper(),
mbSupportsReplacement( false ),
mxImplContext(),
@@ -3662,11 +3629,9 @@ void SdXMLFrameShapeContext::processAttribute( sal_uInt16 nPrefix,
SdXMLCustomShapeContext::SdXMLCustomShapeContext(
SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes > const & rShapes)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
+: SdXMLShapeContext( rImport, xAttrList, rShapes, false/*bTemporaryShape*/ )
{
// See the XMLTextFrameContext ctor, a frame has Writer content (and not
// editeng) if its autostyle has a parent style. Do the same for shapes as well.
@@ -3896,8 +3861,8 @@ SvXMLImportContextRef SdXMLCustomShapeContext::CreateChildContext(
return xContext;
}
-SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes > const & rShapes )
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false )
+SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes > const & rShapes )
+: SdXMLShapeContext( rImport, xAttrList, rShapes, false )
{
}
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 308322a2c21f..8a29b037229a 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -99,8 +99,6 @@ protected:
public:
SdXMLShapeContext( SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -125,8 +123,7 @@ class SdXMLRectShapeContext : public SdXMLShapeContext
public:
- SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLRectShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -148,8 +145,7 @@ class SdXMLLineShapeContext : public SdXMLShapeContext
public:
- SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLLineShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -174,8 +170,7 @@ class SdXMLEllipseShapeContext : public SdXMLShapeContext
sal_Int32 mnEndAngle;
public:
- SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLEllipseShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -196,8 +191,7 @@ class SdXMLPolygonShapeContext : public SdXMLShapeContext
public:
- SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLPolygonShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes, bool bClosed, bool bTemporaryShape);
virtual ~SdXMLPolygonShapeContext() override;
@@ -216,8 +210,7 @@ class SdXMLPathShapeContext : public SdXMLShapeContext
public:
- SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLPathShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -237,8 +230,7 @@ class SdXMLTextBoxShapeContext : public SdXMLShapeContext
public:
- SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLTextBoxShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXMLTextBoxShapeContext() override;
@@ -257,8 +249,7 @@ private:
public:
- SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLControlShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -293,8 +284,7 @@ private:
public:
- SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLConnectorShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -315,8 +305,7 @@ private:
public:
- SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLMeasureShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -336,8 +325,7 @@ private:
sal_Int32 mnPageNumber;
public:
- SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLPageShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -358,8 +346,7 @@ private:
public:
- SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLCaptionShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -380,8 +367,7 @@ private:
public:
- SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLGraphicObjectShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXMLGraphicObjectShapeContext() override;
@@ -403,8 +389,7 @@ class SdXMLChartShapeContext : public SdXMLShapeContext
public:
- SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLChartShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -428,8 +413,7 @@ private:
public:
- SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLObjectShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXMLObjectShapeContext() override;
@@ -458,8 +442,7 @@ private:
public:
- SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLAppletShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXMLAppletShapeContext() override;
@@ -487,8 +470,7 @@ private:
public:
- SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLPluginShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXMLPluginShapeContext() override;
@@ -515,8 +497,7 @@ private:
public:
- SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLFloatingFrameShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXMLFloatingFrameShapeContext() override;
@@ -545,8 +526,7 @@ protected:
public:
- SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLFrameShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
bool bTemporaryShape);
@@ -571,7 +551,7 @@ class SdXMLCustomShapeContext : public SdXMLShapeContext
public:
- SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
+ SdXMLCustomShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes);
virtual ~SdXMLCustomShapeContext() override;
@@ -592,8 +572,7 @@ class SdXMLTableShapeContext : public SdXMLShapeContext
{
public:
- SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLocalName,
+ SdXMLTableShapeContext( SvXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes );
virtual ~SdXMLTableShapeContext() override;
More information about the Libreoffice-commits
mailing list