From f7a5335ef50f4a9775703a038006dfb983a50a15 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 30 Nov 2017 18:29:37 +0100
Subject: 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
---
 sc/source/filter/xml/xmlimprt.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sc/source/filter/xml/xmlimprt.cxx')

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index e0795f56808d..b3f464b1def2 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -658,7 +658,7 @@ sc::PivotTableSources& ScXMLImport::GetPivotTableSources()
     return *mpPivotSources;
 }
 
-SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix,
+SvXMLImportContext *ScXMLImport::CreateDocumentContext( sal_uInt16 nPrefix,
                                                const OUString& rLocalName,
                                                const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
@@ -676,7 +676,7 @@ SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix,
                 xDPS->getDocumentProperties());
     }
     else
-        pContext = SvXMLImport::CreateContext( nPrefix, rLocalName, xAttrList );
+        pContext = SvXMLImport::CreateDocumentContext( nPrefix, rLocalName, xAttrList );
 
     return pContext;
 }
-- 
cgit