diff options
author | Michael Stahl <mstahl@redhat.com> | 2017-11-30 18:29:37 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-11-30 22:32:46 +0100 |
commit | f7a5335ef50f4a9775703a038006dfb983a50a15 (patch) | |
tree | 979d14b4145c5b1cf2809b5d3eab32ff4a705ef7 /xmloff/source/draw/animationimport.cxx | |
parent | ebb34571c19c5ac939fbf5aed2ab66ee18e298dc (diff) |
xmloff: turn SvXMLImportContext into a no-op base class
Fix the non-obvious and potentially dangerous recursion that is
implicit in xmloff's context code.
SvXMLImportContext::CreateChildContext() now always creates a
SvXMLImportContext, does not delegate to SvXMLImport.
Rename CreateContext to CreateDocumentContext, to make its purpose of
creating only the top-level context more obvious.
With the previous changes to CreateContext overrides in sw,
reportdesign and dbaccess, this hopefully shouldn't break anything.
Change-Id: I9e147bf6297bbac9e8470454881da73f6e39db0a
Diffstat (limited to 'xmloff/source/draw/animationimport.cxx')
-rw-r--r-- | xmloff/source/draw/animationimport.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 8134fd671499..75553fa8a1cd 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -1243,7 +1243,7 @@ class AnimationsImport: public SvXMLImport, public XAnimationNodeSupplier public: explicit AnimationsImport( const Reference< XComponentContext > & rxContext ); - SvXMLImportContext* CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList) override; + SvXMLImportContext* CreateDocumentContext(sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList) override; // XInterface virtual Any SAL_CALL queryInterface( const Type& aType ) override; @@ -1305,7 +1305,9 @@ void SAL_CALL AnimationsImport::release() throw () SvXMLImport::release(); } -SvXMLImportContext *AnimationsImport::CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList) +SvXMLImportContext *AnimationsImport::CreateDocumentContext( + sal_uInt16 const nPrefix, const OUString& rLocalName, + const Reference<XAttributeList>& xAttrList) { SvXMLImportContext* pContext = nullptr; @@ -1315,7 +1317,7 @@ SvXMLImportContext *AnimationsImport::CreateContext(sal_uInt16 nPrefix, const OU } else { - pContext = SvXMLImport::CreateContext(nPrefix, rLocalName, xAttrList); + pContext = SvXMLImport::CreateDocumentContext(nPrefix, rLocalName, xAttrList); } return pContext; |