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

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Sun Nov 22 10:28:58 UTC 2020


 xmloff/inc/XMLStringBufferImportContext.hxx         |    8 --------
 xmloff/source/text/XMLStringBufferImportContext.cxx |   11 -----------
 xmloff/source/text/txtfldi.cxx                      |   11 ++++-------
 3 files changed, 4 insertions(+), 26 deletions(-)

New commits:
commit 018706ff4fe0bc25d401f789d0c6750a0e94ec1a
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Fri Nov 20 17:23:38 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Nov 22 11:28:21 2020 +0100

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

diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index 7896667ff357..1975f1e5a0bc 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -29,8 +29,6 @@
 /**
  * Import all text into a string buffer.  Paragraph elements (<text:p>)
  * are recognized and cause a return character (0x0a) to be added.
- *
- * Supports both old and fast-parser.
  */
 class XMLStringBufferImportContext final : public SvXMLImportContext
 {
@@ -38,12 +36,6 @@ class XMLStringBufferImportContext final : public SvXMLImportContext
 
 public:
 
-    XMLStringBufferImportContext(
-        SvXMLImport& rImport,
-        sal_uInt16 nPrefix,
-        const OUString& sLocalName,
-        OUStringBuffer& rBuffer);
-
     XMLStringBufferImportContext(
         SvXMLImport& rImport,
         OUStringBuffer& rBuffer);
diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx
index f61db1fdf6d3..9e25d6234694 100644
--- a/xmloff/source/text/XMLStringBufferImportContext.cxx
+++ b/xmloff/source/text/XMLStringBufferImportContext.cxx
@@ -27,17 +27,6 @@ using ::com::sun::star::xml::sax::XAttributeList;
 using ::xmloff::token::IsXMLToken;
 using ::xmloff::token::XML_P;
 
-
-XMLStringBufferImportContext::XMLStringBufferImportContext(
-    SvXMLImport& rImport,
-    sal_uInt16 nPrefix,
-    const OUString& sLocalName,
-    OUStringBuffer& rBuffer) :
-    SvXMLImportContext(rImport, nPrefix, sLocalName),
-    rTextBuffer(rBuffer)
-{
-}
-
 XMLStringBufferImportContext::XMLStringBufferImportContext(
     SvXMLImport& rImport,
     OUStringBuffer& rBuffer) :
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 121664d1973c..60c6027ce83b 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3318,19 +3318,16 @@ SvXMLImportContextRef XMLAnnotationImportContext::CreateChildContext(
     if( XML_NAMESPACE_DC == nPrefix )
     {
         if( IsXMLToken( rLocalName, XML_CREATOR ) )
-            pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
-                                            rLocalName, aAuthorBuffer);
+            pContext = new XMLStringBufferImportContext(GetImport(), aAuthorBuffer);
         else if( IsXMLToken( rLocalName, XML_DATE ) )
-            pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
-                                            rLocalName, aDateBuffer);
+            pContext = new XMLStringBufferImportContext(GetImport(), aDateBuffer);
     }
     else if (((XML_NAMESPACE_TEXT == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix)
                  && IsXMLToken(rLocalName, XML_SENDER_INITIALS))
              || (XML_NAMESPACE_META == nPrefix
                  && IsXMLToken(rLocalName, XML_CREATOR_INITIALS)))
     {
-        pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
-                                        rLocalName, aInitialsBuffer);
+        pContext = new XMLStringBufferImportContext(GetImport(), aInitialsBuffer);
     }
 
     if( !pContext )
@@ -3367,7 +3364,7 @@ SvXMLImportContextRef XMLAnnotationImportContext::CreateChildContext(
         }
 
         if( !pContext )
-            pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,  rLocalName, aTextBuffer);
+            pContext = new XMLStringBufferImportContext(GetImport(), aTextBuffer);
     }
 
     return pContext;


More information about the Libreoffice-commits mailing list