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 /dbaccess | |
| 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 'dbaccess')
| -rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index e6db6b055d41..553b536e8ec9 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -514,7 +514,7 @@ public: } }; -SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix, +SvXMLImportContext* ODBFilter::CreateDocumentContext(sal_uInt16 const nPrefix, const OUString& rLocalName, const uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { @@ -538,7 +538,7 @@ SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix, } if ( !pContext ) - pContext = SvXMLImport::CreateContext( nPrefix, rLocalName, xAttrList ); + pContext = SvXMLImport::CreateDocumentContext( nPrefix, rLocalName, xAttrList ); return pContext; } diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index abe106cb60b1..9c8188ebb21b 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -99,7 +99,7 @@ public: protected: // SvXMLImport - virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, + virtual SvXMLImportContext *CreateDocumentContext(sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; |