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

[Noel Grandin (via logerrit)]

 xmloff/source/text/XMLTextFrameContext.cxx |   24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

New commits:
commit 32df28ba6c81a9ff29dfbeb39f2d83917dd69b33
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Dec 6 09:35:55 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Dec 6 11:00:27 2020 +0100

    fastparser in XMLTextFrameContext_Impl
    
    Change-Id: I69ca9141ccbedeb92909c782dcacd791d3517c2e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107276
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index b764d59ca4f6..efa08da145f7 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -404,10 +404,6 @@ public:
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
         sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override;
 
-    SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-                const OUString& rLocalName,
-                 const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
-
     void SetHyperlink( const OUString& rHRef,
                        const OUString& rName,
                        const OUString& rTargetFrameName,
@@ -1219,23 +1215,19 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTextFrameContext_Im
             return pEContext;
         }
     }
-    return nullptr;
-}
-
-SvXMLImportContextRef XMLTextFrameContext_Impl::CreateChildContext(
-        sal_uInt16 nPrefix,
-        const OUString& rLocalName,
-        const Reference< XAttributeList > & xAttrList )
-{
-    SvXMLImportContext *pContext = nullptr;
 
     if( xOldTextCursor.is() )  // text-box
-        pContext = GetImport().GetTextImport()->CreateTextChildContext(
-                            GetImport(), nPrefix, rLocalName, xAttrList,
+    {
+        auto p = GetImport().GetTextImport()->CreateTextChildContext(
+                            GetImport(), nElement, xAttrList,
                             XMLTextType::TextBox );
+        if (p)
+            return p;
+    }
 
+    XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
 
-    return pContext;
+    return nullptr;
 }
 
 void XMLTextFrameContext_Impl::characters( const OUString& rChars )