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 /starmath | |
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 'starmath')
-rw-r--r-- | starmath/source/mathmlimport.cxx | 2 | ||||
-rw-r--r-- | starmath/source/mathmlimport.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 500ecff58425..2147001061de 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -2789,7 +2789,7 @@ void SmXMLActionContext_Impl::EndElement() rNodeStack.push_front(std::move(pSelected)); } -SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix, +SvXMLImportContext *SmXMLImport::CreateDocumentContext(sal_uInt16 nPrefix, const OUString &rLocalName, const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/) { diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index 4db626df4d0a..3d017c1a25a7 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -94,7 +94,7 @@ public: void SAL_CALL endDocument() override; - SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, + SvXMLImportContext *CreateDocumentContext(sal_uInt16 nPrefix, const OUString &rLocalName, const css::uno::Reference < css::xml::sax::XAttributeList> &xAttrList) override; |