summaryrefslogtreecommitdiff
path: root/xmloff/source/draw
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r--xmloff/source/draw/sdpropls.cxx2
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx12
-rw-r--r--xmloff/source/draw/shapeexport.cxx2
-rw-r--r--xmloff/source/draw/shapeimport.cxx22
-rw-r--r--xmloff/source/draw/xexptran.cxx4
-rw-r--r--xmloff/source/draw/ximp3dobject.cxx20
-rw-r--r--xmloff/source/draw/ximp3dobject.hxx12
-rw-r--r--xmloff/source/draw/ximpbody.cxx5
-rw-r--r--xmloff/source/draw/ximpbody.hxx2
-rw-r--r--xmloff/source/draw/ximpshap.cxx35
-rw-r--r--xmloff/source/draw/ximpshap.hxx21
-rw-r--r--xmloff/source/draw/ximpstyl.cxx6
-rw-r--r--xmloff/source/draw/ximpstyl.hxx2
13 files changed, 59 insertions, 86 deletions
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 6011498a12d3..da4366fe0396 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1121,7 +1121,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
pHdl = new XMLCaptionEscapeRelative();
break;
case XML_SD_TYPE_CAPTION_ESC_ABS:
- pHdl = new XMLPercentOrMeasurePropertyHandler( false );
+ pHdl = new XMLPercentOrMeasurePropertyHandler;
break;
case XML_SD_TYPE_CAPTION_ESC_DIR:
pHdl = new XMLEnumPropertyHdl( pXML_Caption_Esc_Dir_Enum , ::cppu::UnoType<sal_Int32>::get());
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index a4df0e843844..a6c9f368a389 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -688,7 +688,7 @@ SvXMLImportContext *SdXMLImport::CreateBodyContext(const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>&)
{
SvXMLImportContext *pContext = nullptr;
- pContext = new SdXMLBodyContext(*this, XML_NAMESPACE_OFFICE, rLocalName);
+ pContext = new SdXMLBodyContext(*this, rLocalName);
return pContext;
}
@@ -699,7 +699,7 @@ SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName,
return GetShapeImport()->GetStylesContext();
GetShapeImport()->SetStylesContext(new SdXMLStylesContext(
- *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, false));
+ *this, rLocalName, xAttrList, false));
return GetShapeImport()->GetStylesContext();
}
@@ -711,7 +711,7 @@ SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalN
return GetShapeImport()->GetAutoStylesContext();
GetShapeImport()->SetAutoStylesContext(new SdXMLStylesContext(
- *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, true));
+ *this, rLocalName, xAttrList, true));
return GetShapeImport()->GetAutoStylesContext();
}
@@ -723,7 +723,7 @@ SvXMLImportContext* SdXMLImport::CreateMasterStylesContext(const OUString& rLoca
return mpMasterStylesContext;
mpMasterStylesContext = new SdXMLMasterStylesContext(
- *this, XML_NAMESPACE_OFFICE, rLocalName);
+ *this, rLocalName);
mpMasterStylesContext->AddFirstRef();
return mpMasterStylesContext;
@@ -745,9 +745,7 @@ SvXMLImportContext *SdXMLImport::CreateScriptContext(
{
SvXMLImportContext *pContext = nullptr;
- pContext = new XMLScriptContext( *this,
- XML_NAMESPACE_OFFICE, rLocalName,
- GetModel() );
+ pContext = new XMLScriptContext( *this, rLocalName, GetModel() );
return pContext;
}
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 2c71dfa2e380..976cf1afd8dc 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -4298,7 +4298,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
double fDepth = 0;
if ( aDepthParaPair.First.Value >>= fDepth )
{
- rExport.GetMM100UnitConverter().convertDouble( aStrBuffer, fDepth, true );
+ rExport.GetMM100UnitConverter().convertDouble( aStrBuffer, fDepth );
ExportParameter( aStrBuffer, aDepthParaPair.Second );
aStr = aStrBuffer.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_DEPTH, aStr );
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index f75da95b5393..1f98a132bb4b 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -409,25 +409,25 @@ SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext(
case XML_TOK_3DSCENE_3DCUBE:
{
// dr3d:3dcube inside dr3d:3dscene context
- pContext = new SdXML3DCubeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false);
+ pContext = new SdXML3DCubeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DSPHERE:
{
// dr3d:3dsphere inside dr3d:3dscene context
- pContext = new SdXML3DSphereObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false);
+ pContext = new SdXML3DSphereObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DLATHE:
{
// dr3d:3dlathe inside dr3d:3dscene context
- pContext = new SdXML3DLatheObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false);
+ pContext = new SdXML3DLatheObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DEXTRUDE:
{
// dr3d:3dextrude inside dr3d:3dscene context
- pContext = new SdXML3DExtrudeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false);
+ pContext = new SdXML3DExtrudeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
break;
}
}
@@ -568,7 +568,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
case XML_TOK_GROUP_CUSTOM_SHAPE:
{
// draw:customshape
- pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+ pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_A:
@@ -617,20 +617,20 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
case XML_TOK_FRAME_TEXT_BOX:
{
// text:text-box inside group context
- pContext = new SdXMLTextBoxShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+ pContext = new SdXMLTextBoxShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_IMAGE:
{
// office:image inside group context
- pContext = new SdXMLGraphicObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+ pContext = new SdXMLGraphicObjectShapeContext( rImport, p_nPrefix, rLocalName, 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, false );
+ pContext = new SdXMLObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_TABLE:
@@ -644,19 +644,19 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
case XML_TOK_FRAME_PLUGIN:
{
// draw:plugin
- pContext = new SdXMLPluginShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+ pContext = new SdXMLPluginShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_FLOATING_FRAME:
{
// draw:floating-frame
- pContext = new SdXMLFloatingFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+ pContext = new SdXMLFloatingFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_FRAME_APPLET:
{
// draw:applet
- pContext = new SdXMLAppletShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+ pContext = new SdXMLAppletShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
break;
}
// add other shapes here...
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 82c2fa84fff6..7c4debc31f50 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -130,7 +130,7 @@ double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32
if(!sNumberString.isEmpty())
{
if(bLookForUnits)
- rConv.convertDouble(fRetval, sNumberString.makeStringAndClear(), true);
+ rConv.convertDouble(fRetval, sNumberString.makeStringAndClear());
else
{
::sax::Converter::convertDouble(fRetval,
@@ -154,7 +154,7 @@ void Imp_PutDoubleChar(OUString& rStr, const SvXMLUnitConverter& rConv, double f
OUStringBuffer sStringBuffer;
if(bConvertUnits)
- rConv.convertDouble(sStringBuffer, fValue, true);
+ rConv.convertDouble(sStringBuffer, fValue);
else
{
::sax::Converter::convertDouble(sStringBuffer, fValue);
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index baf1aebd24cd..3f8d16bd8723 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -110,9 +110,8 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- uno::Reference< drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+ uno::Reference< drawing::XShapes >& rShapes)
+: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
maMinEdge(-2500.0, -2500.0, -2500.0),
maMaxEdge(2500.0, 2500.0, 2500.0),
mbMinEdgeUsed(false),
@@ -211,9 +210,8 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- uno::Reference< drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+ uno::Reference< drawing::XShapes >& rShapes)
+: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
maCenter(0.0, 0.0, 0.0),
maSize(5000.0, 5000.0, 5000.0),
mbCenterUsed(false),
@@ -395,9 +393,8 @@ SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext(
sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- uno::Reference< drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+ uno::Reference< drawing::XShapes >& rShapes)
+: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
{
}
@@ -429,9 +426,8 @@ SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext(
sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- uno::Reference< drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+ uno::Reference< drawing::XShapes >& rShapes)
+: SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
{
}
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index f8d40969c4f2..db180dbbc9c6 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -67,8 +67,7 @@ public:
SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXML3DCubeObjectShapeContext();
virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
@@ -89,8 +88,7 @@ public:
SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXML3DSphereObjectShapeContext();
virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
@@ -126,8 +124,7 @@ public:
SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXML3DLatheObjectShapeContext();
virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
@@ -143,8 +140,7 @@ public:
SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXML3DExtrudeObjectShapeContext();
virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 7f380088f28d..586539f92505 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -19,6 +19,7 @@
#include "ximpbody.hxx"
#include <xmloff/prstylei.hxx>
+#include <xmloff/xmlnmspe.hxx>
#include "ximpnote.hxx"
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XDrawPages.hpp>
@@ -304,8 +305,8 @@ void SdXMLDrawPageContext::EndElement()
}
SdXMLBodyContext::SdXMLBodyContext( SdXMLImport& rImport,
- sal_uInt16 nPrfx, const OUString& rLocalName )
-: SvXMLImportContext( rImport, nPrfx, rLocalName )
+ const OUString& rLocalName )
+: SvXMLImportContext( rImport, XML_NAMESPACE_OFFICE, rLocalName )
{
}
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index cc4361ecd2e7..95358cfc3bce 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -58,7 +58,7 @@ class SdXMLBodyContext : public SvXMLImportContext
SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
- SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName );
+ SdXMLBodyContext( SdXMLImport& rImport, const OUString& rLocalName );
virtual ~SdXMLBodyContext();
virtual SvXMLImportContext *CreateChildContext(
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 41454f109489..45f1e5cff4fb 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1583,9 +1583,8 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- uno::Reference< drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+ uno::Reference< drawing::XShapes >& rShapes)
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
mnRadius(0),
maChainNextName("")
{
@@ -2403,9 +2402,8 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext(
sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- uno::Reference< drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+ uno::Reference< drawing::XShapes >& rShapes)
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
maURL()
{
}
@@ -2670,9 +2668,8 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre
SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+ css::uno::Reference< css::drawing::XShapes >& rShapes)
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
{
}
@@ -2882,9 +2879,8 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+ css::uno::Reference< css::drawing::XShapes >& rShapes)
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
mbIsScript( false )
{
}
@@ -3043,9 +3039,8 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n
SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape) :
-SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+ css::uno::Reference< css::drawing::XShapes >& rShapes) :
+SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
mbMedia( false )
{
}
@@ -3320,9 +3315,8 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n
SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+ css::uno::Reference< css::drawing::XShapes >& rShapes)
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
{
}
@@ -3707,9 +3701,8 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext(
sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- uno::Reference< drawing::XShapes >& rShapes,
- bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+ uno::Reference< drawing::XShapes >& rShapes)
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, 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.
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index b8883e56cb6e..c4244853c9ae 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -246,8 +246,7 @@ public:
SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXMLTextBoxShapeContext();
virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
@@ -389,8 +388,7 @@ public:
SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXMLGraphicObjectShapeContext();
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -439,8 +437,7 @@ public:
SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXMLObjectShapeContext();
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -470,8 +467,7 @@ public:
SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXMLAppletShapeContext();
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -500,8 +496,7 @@ public:
SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXMLPluginShapeContext();
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -531,8 +526,7 @@ public:
SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXMLFloatingFrameShapeContext();
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -589,8 +583,7 @@ public:
SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
- css::uno::Reference< css::drawing::XShapes >& rShapes,
- bool bTemporaryShape);
+ css::uno::Reference< css::drawing::XShapes >& rShapes);
virtual ~SdXMLCustomShapeContext();
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 978199e4c722..09cc9008331b 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -936,11 +936,10 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
SdXMLStylesContext::SdXMLStylesContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
bool bIsAutoStyle)
-: SvXMLStylesContext(rImport, nPrfx, rLName, xAttrList),
+: SvXMLStylesContext(rImport, XML_NAMESPACE_OFFICE, rLName, xAttrList),
mbIsAutoStyle(bIsAutoStyle)
{
Reference< uno::XComponentContext > xContext = rImport.GetComponentContext();
@@ -1459,9 +1458,8 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co
SdXMLMasterStylesContext::SdXMLMasterStylesContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
const OUString& rLName)
-: SvXMLImportContext( rImport, nPrfx, rLName)
+: SvXMLImportContext( rImport, XML_NAMESPACE_OFFICE, rLName)
{
}
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index c82cb06302e2..6e1c5c08f2ad 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -210,7 +210,6 @@ public:
SdXMLStylesContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
bool bIsAutoStyle);
@@ -238,7 +237,6 @@ public:
SdXMLMasterStylesContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
const OUString& rLName);
virtual ~SdXMLMasterStylesContext();
generated by cgit (git 2.34.1) at 2025-05-18 06:51:45 +0000