[Libreoffice-commits] core.git: xmloff/inc xmloff/source

[Noel Grandin (via logerrit)]

 xmloff/inc/xmlversion.hxx         |    6 ++++++
 xmloff/source/meta/xmlversion.cxx |    6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit d26fb4b6a03976063f788703f5a32b868cc49f1d
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jan 16 08:17:24 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jan 16 08:03:48 2020 +0100

    fix XMLVersionListImport fast-parser
    
    AddAtIndex does not seem to play nice with the fast-parser stuff
    
    Change-Id: Iea64566b595e952b8bdf767f51c0c1813f0abb6f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86902
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index 6faaa0cd240f..8f0c1c08440f 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -77,6 +77,9 @@ public:
 
     virtual ~XMLVersionListContext() override;
 
+    virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+                const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) override {}
+
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
         createFastChildContext(sal_Int32 nElement,
             const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttribs) override;
@@ -94,6 +97,9 @@ public:
     XMLVersionContext( XMLVersionListImport& rImport,
                           const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
+    virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+                const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) override {}
+
     virtual ~XMLVersionContext() override;
 };
 
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index dba5e8d4f4cd..ff53368af587 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -105,8 +105,8 @@ XMLVersionListImport::XMLVersionListImport(
 :   SvXMLImport(rContext, ""),
     maVersions( rVersions )
 {
-    GetNamespaceMap().AddAtIndex( xmloff::token::GetXMLToken(xmloff::token::XML_NP_VERSIONS_LIST),
-                                  xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_FRAMEWORK );
+    GetNamespaceMap().Add( xmloff::token::GetXMLToken(xmloff::token::XML_NP_VERSIONS_LIST),
+                           xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_VERSIONS_LIST );
 }
 
 XMLVersionListImport::~XMLVersionListImport() throw()
@@ -117,7 +117,7 @@ SvXMLImportContext *XMLVersionListImport::CreateFastContext( sal_Int32 nElement,
 {
     SvXMLImportContext *pContext = nullptr;
 
-    if ( nElement == XML_ELEMENT(FRAMEWORK, xmloff::token::XML_VERSION_LIST) )
+    if ( nElement == XML_ELEMENT(VERSIONS_LIST, xmloff::token::XML_VERSION_LIST) )
     {
         pContext = new XMLVersionListContext( *this );
     }