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 /linguistic | |
| 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 'linguistic')
| -rw-r--r-- | linguistic/source/convdicxml.cxx | 2 | ||||
| -rw-r--r-- | linguistic/source/convdicxml.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 964a51edc396..97a1d6a56268 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -370,7 +370,7 @@ void SAL_CALL ConvDicXMLImport::startDocument() SvXMLImport::startDocument(); } -SvXMLImportContext * ConvDicXMLImport::CreateContext( +SvXMLImportContext * ConvDicXMLImport::CreateDocumentContext( sal_uInt16 nPrefix, const OUString &rLocalName, const uno::Reference < xml::sax::XAttributeList > & /*rxAttrList*/ ) diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index 5339a85e2dae..9a2b3c776c37 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -87,7 +87,7 @@ public: virtual void SAL_CALL startDocument() override; - virtual SvXMLImportContext * CreateContext( + virtual SvXMLImportContext * CreateDocumentContext( sal_uInt16 nPrefix, const OUString &rLocalName, const css::uno::Reference < css::xml::sax::XAttributeList > &rxAttrList ) override; |