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

[Noel Grandin (via logerrit)]

 reportdesign/source/filter/xml/xmlfilter.cxx |   26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

New commits:
commit e4ba4e56eff11bf914819b19f427e30d6acd1ac0
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jan 22 10:14:46 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 22 10:45:56 2020 +0100

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

diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 46ed887f092c..3897a5200b5f 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -93,10 +93,7 @@ class RptMLMasterStylesContext_Impl:
 public:
 
 
-    RptMLMasterStylesContext_Impl(
-            ORptFilter& rImport, sal_uInt16 nPrfx,
-            const OUString& rLName ,
-            const uno::Reference< xml::sax::XAttributeList > & xAttrList );
+    RptMLMasterStylesContext_Impl( ORptFilter& rImport );
 
     RptMLMasterStylesContext_Impl(const RptMLMasterStylesContext_Impl&) = delete;
     RptMLMasterStylesContext_Impl& operator=(const RptMLMasterStylesContext_Impl&) = delete;
@@ -105,11 +102,8 @@ public:
 
 }
 
-RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl(
-        ORptFilter& rImport, sal_uInt16 nPrfx,
-        const OUString& rLName ,
-        const uno::Reference< xml::sax::XAttributeList > & xAttrList ) :
-    XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList )
+RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl( ORptFilter& rImport ) :
+    XMLTextMasterStylesContext( rImport )
 {
 }
 
@@ -630,6 +624,13 @@ public:
                 rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
                 return rImport.CreateFontDeclsContext();
                 break;
+            case XML_ELEMENT(OFFICE, XML_MASTER_STYLES):
+                {
+                    SvXMLStylesContext* pStyleContext = new RptMLMasterStylesContext_Impl(rImport);
+                    rImport.SetMasterStyles(pStyleContext);
+                    return pStyleContext;
+                }
+                break;
         }
         return nullptr;
     }
@@ -652,13 +653,6 @@ public:
                 // don't use the autostyles from the styles-document for the progress
                 pContext = rImport.CreateStylesContext(rLocalName, xAttrList, true);
                 break;
-            case XML_TOK_CONTENT_MASTERSTYLES:
-                {
-                    SvXMLStylesContext* pStyleContext = new RptMLMasterStylesContext_Impl(rImport, nPrefix, rLocalName, xAttrList);//CreateMasterStylesContext( rLocalName,xAttrList );
-                    pContext = pStyleContext;
-                    rImport.SetMasterStyles(pStyleContext);
-                }
-                break;
             default:
                 break;
         }