diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/SwXMLSectionList.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/swg/SwXMLSectionList.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlimp.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/config/StoredChapterNumbering.cxx | 4 |
5 files changed, 7 insertions, 11 deletions
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx index 45fd8bc8c2c7..82c8f66340dd 100644 --- a/sw/inc/SwXMLSectionList.hxx +++ b/sw/inc/SwXMLSectionList.hxx @@ -24,9 +24,7 @@ class SwXMLSectionList : public SvXMLImport { protected: - // This method is called after the namespace map has been updated, but - // before a context for the current element has been pushed. - 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; diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx index 2e90f05a518a..cad35a9958bd 100644 --- a/sw/source/core/swg/SwXMLSectionList.cxx +++ b/sw/source/core/swg/SwXMLSectionList.cxx @@ -103,7 +103,7 @@ SwXMLSectionList::~SwXMLSectionList() { } -SvXMLImportContext *SwXMLSectionList::CreateContext( +SvXMLImportContext *SwXMLSectionList::CreateDocumentContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList> & ) diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index d892d7768775..e2118d87ca34 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -353,7 +353,7 @@ const SvXMLTokenMap& SwXMLImport::GetDocElemTokenMap() return *m_pDocElemTokenMap; } -SvXMLImportContext *SwXMLImport::CreateContext( +SvXMLImportContext *SwXMLImport::CreateDocumentContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) @@ -385,7 +385,7 @@ SvXMLImportContext *SwXMLImport::CreateContext( xDocProps); } else - pContext = SvXMLImport::CreateContext( nPrefix, rLocalName, xAttrList ); + pContext = SvXMLImport::CreateDocumentContext(nPrefix, rLocalName, xAttrList); return pContext; } diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 444186992c34..aa7ad833e356 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -103,9 +103,7 @@ class SwXMLImport: public SvXMLImport protected: - // This method is called after the namespace map has been updated, but - // before a context for the current element has been pushed. - 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; diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx index c575863f00e7..531e5b424bbc 100644 --- a/sw/source/uibase/config/StoredChapterNumbering.cxx +++ b/sw/source/uibase/config/StoredChapterNumbering.cxx @@ -386,7 +386,7 @@ public: { } - virtual SvXMLImportContext * CreateContext( + virtual SvXMLImportContext * CreateDocumentContext( sal_uInt16 const nPrefix, OUString const& rLocalName, uno::Reference<xml::sax::XAttributeList> const& xAttrList) override { @@ -395,7 +395,7 @@ public: return new StoredChapterNumberingRootContext(m_rNumRules, *this, nPrefix, rLocalName); } - return SvXMLImport::CreateContext(nPrefix, rLocalName, xAttrList); + return SvXMLImport::CreateDocumentContext(nPrefix, rLocalName, xAttrList); } }; |