diff options
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r-- | xmloff/source/draw/XMLImageMapContext.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/draw/XMLReplacementImageContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/descriptionimp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/descriptionimp.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/eventimp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/layerimp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/ximp3dscene.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/ximp3dscene.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpcustomshape.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpcustomshape.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpgrp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/ximpgrp.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 49 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.hxx | 22 |
14 files changed, 54 insertions, 53 deletions
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 99949c2d5caf..a8f8d13d98b8 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -126,7 +126,7 @@ public: void StartElement( const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; - void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, @@ -195,7 +195,7 @@ void XMLImageMapObjectContext::StartElement( } } -void XMLImageMapObjectContext::EndElement() +void XMLImageMapObjectContext::endFastElement(sal_Int32 ) { // only create and insert image map object if validity flag is set // (and we actually have an image map) @@ -611,7 +611,7 @@ SvXMLImportContextRef XMLImageMapContext::CreateChildContext( return xContext; } -void XMLImageMapContext::EndElement() +void XMLImageMapContext::endFastElement(sal_Int32 ) { Reference < XPropertySetInfo > xInfo = xPropertySet->getPropertySetInfo(); diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index e4a96c41eecc..6752875113cc 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -69,7 +69,7 @@ XMLReplacementImageContext::~XMLReplacementImageContext() { } -void XMLReplacementImageContext::EndElement() +void XMLReplacementImageContext::endFastElement(sal_Int32 ) { OSL_ENSURE( !m_sHRef.isEmpty() || m_xBase64Stream.is(), "neither URL nor base64 image data given" ); diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index 26b006d8164b..0e41cd680331 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -45,7 +45,7 @@ SdXMLDescriptionContext::~SdXMLDescriptionContext() { } -void SdXMLDescriptionContext::EndElement() +void SdXMLDescriptionContext::endFastElement(sal_Int32 ) { if( msText.isEmpty() ) return; diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index f45feb775f15..6dee51daf293 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -39,7 +39,7 @@ public: const css::uno::Reference< css::drawing::XShape >& rxShape ); virtual ~SdXMLDescriptionContext() override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; // This method is called for all characters that are contained in the // current element. The default is to ignore them. diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 3244cb105ffc..9d6415cfe013 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -87,7 +87,7 @@ public: SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape ); virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; class XMLEventSoundContext : public SvXMLImportContext @@ -241,7 +241,7 @@ SvXMLImportContextRef SdXMLEventContext::CreateChildContext( sal_uInt16 nPrefix, return new XMLEventSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this ); } -void SdXMLEventContext::EndElement() +void SdXMLEventContext::endFastElement(sal_Int32 ) { GetImport().GetShapeImport()->addShapeEvents(maData); } diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index c4bfedbea838..ab809d320695 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -56,7 +56,7 @@ public: SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager ); virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; private: css::uno::Reference< css::container::XNameAccess > mxLayerManager; @@ -111,7 +111,7 @@ SvXMLImportContextRef SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, return nullptr; } -void SdXMLLayerContext::EndElement() +void SdXMLLayerContext::endFastElement(sal_Int32 ) { SAL_WARN_IF( msName.isEmpty(), "xmloff", "xmloff::SdXMLLayerContext::EndElement(), draw:layer element without draw:name!" ); if( msName.isEmpty() ) diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 50c400e5c0c9..9734e699cea1 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -151,7 +151,7 @@ void SdXML3DSceneShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -void SdXML3DSceneShapeContext::EndElement() +void SdXML3DSceneShapeContext::endFastElement(sal_Int32 nElement) { if(!mxShape.is()) return; @@ -166,7 +166,7 @@ void SdXML3DSceneShapeContext::EndElement() GetImport().GetShapeImport()->popGroupAndPostProcess(); // call parent - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } SvXMLImportContextRef SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPrefix, diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index 7597857a9205..f613442d257c 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -44,7 +44,7 @@ public: virtual ~SdXML3DSceneShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index e923e040e2b2..9082528b05c9 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -1177,7 +1177,7 @@ static void CheckAndResolveEquationParameter( css::drawing::EnhancedCustomShapeP } } -void XMLEnhancedCustomShapeContext::EndElement() +void XMLEnhancedCustomShapeContext::endFastElement(sal_Int32 ) { // resolve properties that are indexing an Equation if ( !maEquations.empty() ) diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index aa662f176069..b5f91de1c499 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -55,7 +55,7 @@ public: const OUString& rLocalName, std::vector< css::beans::PropertyValue >& rCustomShapeGeometry ); virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index efe6d3751b1a..c6d7d12c2843 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -90,12 +90,12 @@ void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttri GetImport().GetShapeImport()->finishShape( mxShape, mxAttrList, mxShapes ); } -void SdXMLGroupShapeContext::EndElement() +void SdXMLGroupShapeContext::endFastElement(sal_Int32 nElement) { if( mxChildren.is() ) GetImport().GetShapeImport()->popGroupAndPostProcess(); - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index c3f6726238eb..db8344a026e4 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -43,7 +43,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPGRP_HXX diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 2f84f80d09dc..cc75d01b80c6 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -343,7 +343,7 @@ void SdXMLShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeL GetImport().GetShapeImport()->finishShape( mxShape, mxAttrList, mxShapes ); } -void SdXMLShapeContext::EndElement() +void SdXMLShapeContext::endFastElement(sal_Int32 ) { if(mxCursor.is()) { @@ -2146,7 +2146,7 @@ void SdXMLMeasureShapeContext::StartElement(const uno::Reference< xml::sax::XAtt SdXMLShapeContext::StartElement(xAttrList); } -void SdXMLMeasureShapeContext::EndElement() +void SdXMLMeasureShapeContext::endFastElement(sal_Int32 nElement) { do { @@ -2165,7 +2165,7 @@ void SdXMLMeasureShapeContext::EndElement() } while(false); - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } @@ -2456,7 +2456,7 @@ void SdXMLGraphicObjectShapeContext::StartElement( const css::uno::Reference< cs SdXMLShapeContext::StartElement(mxAttrList); } -void SdXMLGraphicObjectShapeContext::EndElement() +void SdXMLGraphicObjectShapeContext::endFastElement(sal_Int32 nElement) { if (mxBase64Stream.is()) { @@ -2471,7 +2471,7 @@ void SdXMLGraphicObjectShapeContext::EndElement() } } - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } SvXMLImportContextRef SdXMLGraphicObjectShapeContext::CreateChildContext( @@ -2578,12 +2578,12 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri mxChartContext->StartElement( xAttrList ); } -void SdXMLChartShapeContext::EndElement() +void SdXMLChartShapeContext::endFastElement(sal_Int32 nElement) { if( mxChartContext.is() ) - mxChartContext->EndElement(); + mxChartContext->endFastElement(nElement); - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } void SdXMLChartShapeContext::characters( const OUString& rChars ) @@ -2709,7 +2709,7 @@ void SdXMLObjectShapeContext::StartElement( const css::uno::Reference< css::xml: GetImport().GetShapeImport()->finishShape( mxShape, mxAttrList, mxShapes ); } -void SdXMLObjectShapeContext::EndElement() +void SdXMLObjectShapeContext::endFastElement(sal_Int32 nElement) { if (GetImport().isGeneratorVersionOlderThan( SvXMLImport::OOo_34x, SvXMLImport::LO_41x)) // < LO 4.0 @@ -2741,7 +2741,7 @@ void SdXMLObjectShapeContext::EndElement() xProps->setPropertyValue("PersistName", uno::makeAny( aPersistName ) ); } - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } // this is called from the parent group for each unparsed attribute in the attribute list @@ -2873,7 +2873,7 @@ void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStri SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -void SdXMLAppletShapeContext::EndElement() +void SdXMLAppletShapeContext::endFastElement(sal_Int32 nElement) { uno::Reference< beans::XPropertySet > xProps( mxShape, uno::UNO_QUERY ); if( xProps.is() ) @@ -2916,7 +2916,7 @@ void SdXMLAppletShapeContext::EndElement() SetThumbnail(); } - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } SvXMLImportContextRef SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) @@ -3080,7 +3080,7 @@ void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStri SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -void SdXMLPluginShapeContext::EndElement() +void SdXMLPluginShapeContext::endFastElement(sal_Int32 nElement) { uno::Reference< beans::XPropertySet > xProps( mxShape, uno::UNO_QUERY ); @@ -3182,7 +3182,7 @@ void SdXMLPluginShapeContext::EndElement() SetThumbnail(); } - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } SvXMLImportContextRef SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) @@ -3296,7 +3296,7 @@ void SdXMLFloatingFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -void SdXMLFloatingFrameShapeContext::EndElement() +void SdXMLFloatingFrameShapeContext::endFastElement(sal_Int32 nElement) { uno::Reference< beans::XPropertySet > xProps( mxShape, uno::UNO_QUERY ); @@ -3311,7 +3311,7 @@ void SdXMLFloatingFrameShapeContext::EndElement() } SetThumbnail(); - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } @@ -3565,7 +3565,7 @@ void SdXMLFrameShapeContext::StartElement(const uno::Reference< xml::sax::XAttri // ignore } -void SdXMLFrameShapeContext::EndElement() +void SdXMLFrameShapeContext::endFastElement(sal_Int32 nElement) { // solve if multiple image child contexts were imported SvXMLImportContextRef const pSelectedContext(solveMultipleImages()); @@ -3627,14 +3627,15 @@ void SdXMLFrameShapeContext::EndElement() if( mxImplContext.is() ) { + auto nElement2 = XML_ELEMENT(DRAW, eToken); mxImplContext->StartElement( mxAttrList ); - mxImplContext->EndElement(); + mxImplContext->endFastElement(nElement2); } } } mxImplContext = nullptr; - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); } void SdXMLFrameShapeContext::processAttribute( sal_uInt16 nPrefix, @@ -3752,7 +3753,7 @@ void SdXMLCustomShapeContext::StartElement( const uno::Reference< xml::sax::XAtt SdXMLShapeContext::StartElement(xAttrList); } -void SdXMLCustomShapeContext::EndElement() +void SdXMLCustomShapeContext::endFastElement(sal_Int32 nElement) { // Customshapes remember mirror state in its enhanced geometry. // SetTransformation() in StartElement() may have applied mirroring, but that is not yet @@ -3850,7 +3851,7 @@ void SdXMLCustomShapeContext::EndElement() } } - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); // tdf#98163 call a custom slot to be able to reset the UNO API // implementations held on the SdrObjects of type @@ -3987,12 +3988,12 @@ void SdXMLTableShapeContext::StartElement( const css::uno::Reference< css::xml:: } } -void SdXMLTableShapeContext::EndElement() +void SdXMLTableShapeContext::endFastElement(sal_Int32 nElement) { if( mxTableImportContext.is() ) - mxTableImportContext->EndElement(); + mxTableImportContext->endFastElement(nElement); - SdXMLShapeContext::EndElement(); + SdXMLShapeContext::endFastElement(nElement); if( mxShape.is() ) { diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index d93356369e85..308322a2c21f 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -107,7 +107,7 @@ public: virtual ~SdXMLShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; @@ -322,7 +322,7 @@ public: bool bTemporaryShape); virtual ~SdXMLMeasureShapeContext() override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -387,7 +387,7 @@ public: virtual ~SdXMLGraphicObjectShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; @@ -410,7 +410,7 @@ public: bool bTemporaryShape); virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual void SAL_CALL characters( const OUString& rChars ) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; @@ -435,7 +435,7 @@ public: virtual ~SdXMLObjectShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; @@ -465,7 +465,7 @@ public: virtual ~SdXMLAppletShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; @@ -494,7 +494,7 @@ public: virtual ~SdXMLPluginShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; @@ -522,7 +522,7 @@ public: virtual ~SdXMLFloatingFrameShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -556,7 +556,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; }; @@ -577,7 +577,7 @@ public: virtual ~SdXMLCustomShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; @@ -599,7 +599,7 @@ public: virtual ~SdXMLTableShapeContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; |