fastparser in XMLNumberedParaContext

Change-Id: Id5ba57871b4c5d583310cd78c0e677e7deefbc44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106395
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 117 insertions, 17 deletions

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index d8e0812bee0c..84bf3ad1ba55 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1899,6 +1899,107 @@ XMLParaContext::XMLParaContext(
         sStyleName = aCondStyleName;
 }
 
+XMLParaContext::XMLParaContext(
+        SvXMLImport& rImport,
+        sal_Int32 nElement,
+        const Reference< xml::sax::XFastAttributeList > & xAttrList ) :
+    SvXMLImportContext( rImport ),
+    xStart( rImport.GetTextImport()->GetCursorAsRange()->getStart() ),
+    m_bHaveAbout(false),
+    nOutlineLevel( (nElement & TOKEN_MASK) == XML_H ? 1 : -1 ),
+    // Lost outline numbering in master document (#i73509#)
+    mbOutlineLevelAttrFound( false ),
+    mbOutlineContentVisible(true),
+    bIgnoreLeadingSpace( true ),
+    bHeading( (nElement & TOKEN_MASK) == XML_H ),
+    bIsListHeader( false ),
+    bIsRestart (false),
+    nStartValue(0),
+    nStarFontsConvFlags( 0 )
+{
+    bool bHaveXmlId( false );
+    OUString aCondStyleName;
+
+    for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
+    {
+        OUString sValue = aIter.toString();
+        switch( aIter.getToken() )
+        {
+        case XML_ELEMENT(XML, XML_ID):
+            m_sXmlId = sValue;
+            bHaveXmlId = true;
+            break;
+        case XML_ELEMENT(XHTML, XML_ABOUT):
+            m_sAbout = sValue;
+            m_bHaveAbout = true;
+            break;
+        case XML_ELEMENT(XHTML, XML_PROPERTY):
+            m_sProperty = sValue;
+            break;
+        case XML_ELEMENT(XHTML, XML_CONTENT):
+            m_sContent = sValue;
+            break;
+        case XML_ELEMENT(XHTML, XML_DATATYPE):
+            m_sDatatype = sValue;
+            break;
+        case XML_ELEMENT(TEXT, XML_ID):
+            if (!bHaveXmlId) { m_sXmlId = sValue; }
+            break;
+        case XML_ELEMENT(TEXT, XML_STYLE_NAME):
+            sStyleName = sValue;
+            break;
+        case XML_ELEMENT(TEXT, XML_COND_STYLE_NAME):
+            aCondStyleName = sValue;
+            break;
+        case XML_ELEMENT(TEXT, XML_OUTLINE_LEVEL):
+            {
+                sal_Int32 nTmp = sValue.toInt32();
+                if( nTmp > 0 )
+                {
+                    if( nTmp > 127 )
+                        nTmp = 127;
+                    nOutlineLevel = static_cast<sal_Int8>(nTmp);
+                }
+                // Lost outline numbering in master document (#i73509#)
+                mbOutlineLevelAttrFound = true;
+            }
+            break;
+        case XML_ELEMENT(LO_EXT, XML_OUTLINE_CONTENT_VISIBLE):
+            {
+                bool bBool(false);
+                if (::sax::Converter::convertBool(bBool, sValue))
+                    mbOutlineContentVisible = bBool;
+            }
+            break;
+        case XML_ELEMENT(TEXT, XML_IS_LIST_HEADER):
+            {
+                bool bBool(false);
+                if (::sax::Converter::convertBool(bBool, sValue))
+                    bIsListHeader = bBool;
+            }
+            break;
+        case XML_ELEMENT(TEXT, XML_RESTART_NUMBERING):
+            {
+                bool bBool(false);
+                if (::sax::Converter::convertBool(bBool, sValue))
+                    bIsRestart = bBool;
+            }
+            break;
+        case XML_ELEMENT(TEXT, XML_START_VALUE):
+            {
+                nStartValue = sal::static_int_cast< sal_Int16 >(
+                    sValue.toInt32());
+            }
+            break;
+        default:
+            XMLOFF_WARN_UNKNOWN("xmloff", aIter);
+        }
+    }
+
+    if( !aCondStyleName.isEmpty() )
+        sStyleName = aCondStyleName;
+}
+
 void XMLParaContext::endFastElement(sal_Int32 )
 {
     rtl::Reference < XMLTextImportHelper > xTxtImport(
@@ -2292,24 +2393,21 @@ void XMLNumberedParaContext::endFastElement(sal_Int32 )
     }
 }
 
-SvXMLImportContextRef XMLNumberedParaContext::CreateChildContext(
-    sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
-    const Reference< xml::sax::XAttributeList > & i_xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler > XMLNumberedParaContext::createFastChildContext(
+    sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
-    SvXMLImportContextRef xContext;
-
-    if ( XML_NAMESPACE_TEXT == i_nPrefix ||
-            XML_NAMESPACE_LO_EXT == i_nPrefix )
+    switch (nElement)
     {
-        bool bIsHeader( IsXMLToken( i_rLocalName, XML_H ) );
-        if ( bIsHeader || IsXMLToken( i_rLocalName, XML_P ) )
-        {
-            xContext = new XMLParaContext( GetImport(),
-                i_nPrefix, i_rLocalName, i_xAttrList, bIsHeader );
-        }
+        case XML_ELEMENT(TEXT, XML_H):
+        case XML_ELEMENT(LO_EXT, XML_H):
+        case XML_ELEMENT(TEXT, XML_P):
+        case XML_ELEMENT(LO_EXT, XML_P):
+            return new XMLParaContext( GetImport(), nElement, xAttrList );
+        default:
+            XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
     }
 
-    return xContext;
+    return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 72f68c06ae4f..3f64045c593d 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -64,6 +64,9 @@ public:
             const OUString& rLName,
             const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             bool bHeading );
+    XMLParaContext( SvXMLImport& rImport,
+            sal_Int32 nElement,
+            const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
@@ -96,9 +99,8 @@ public:
 
     virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
-    virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 i_nPrefix,
-            const OUString& i_rLocalName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > & i_xAttrList ) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
+        sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override;
 
     sal_Int16 GetLevel() const { return m_Level; }
     const css::uno::Reference< css::container::XIndexReplace >& GetNumRules() const