convert SvXMLImport to fastparser, drop slowparser paths

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

4 files changed, 60 insertions, 181 deletions

diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index d026477a6c3a..5c9c173c1082 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -44,8 +44,6 @@ public:
 
     XMLImageMapContext(
         SvXMLImport& rImport,
-        sal_uInt16 nPrefix,
-        const OUString& rLocalName,
         css::uno::Reference< css::beans::XPropertySet> const & rPropertySet);
 
     virtual ~XMLImageMapContext() override;
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 14a1e58355ee..4b089d6118ce 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -39,9 +39,8 @@ public:
 
 
     XMLReplacementImageContext( SvXMLImport& rImport,
-            sal_uInt16 nPrfx,
-            const OUString& rLName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > & rAttrList,
+            sal_Int32 nElement,
+            const css::uno::Reference< css::xml::sax::XFastAttributeList > & rAttrList,
             const css::uno::Reference< css::beans::XPropertySet >& rPropSet );
     virtual ~XMLReplacementImageContext() override;
 
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b8560b17b3d6..2a694423b640 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -66,13 +66,7 @@ public:
     XMLTextFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
         XMLTextImportHelper& rHlp,              /// Text import helper
-        const char* pService,               /// name of SO API service
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName);     /// element name w/o prefix
-    XMLTextFieldImportContext(
-        SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        const char* pService);               /// name of SO API service
+        const char* pService);                  /// name of SO API service
 
     /// process character data: will be collected in member sContentBuffer
     virtual void SAL_CALL characters( const OUString& sContent ) override;
@@ -90,12 +84,6 @@ public:
     static XMLTextFieldImportContext* CreateTextFieldImportContext(
         SvXMLImport& rImport,
         XMLTextImportHelper& rHlp,
-        sal_uInt16 nPrefix,
-        const OUString& rName,
-        sal_uInt16 nToken);
-    static XMLTextFieldImportContext* CreateTextFieldImportContext(
-        SvXMLImport& rImport,
-        XMLTextImportHelper& rHlp,
         sal_Int32 nElement);
 
 protected:
@@ -141,9 +129,7 @@ public:
 
     XMLSenderFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);      /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
 protected:
     /// start element
@@ -171,9 +157,7 @@ public:
 
     XMLAuthorFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);      /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
 private:
     /// start element
@@ -202,9 +186,7 @@ public:
 
     XMLPlaceholderFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
 private:
     /// process attribute values
@@ -240,9 +222,7 @@ public:
 
     XMLTimeFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -261,9 +241,7 @@ public:
 
     XMLDateFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -285,9 +263,7 @@ public:
 
     XMLPageContinuationImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -316,9 +292,7 @@ public:
 
     XMLPageNumberImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
 
     /// process attribute values
@@ -354,8 +328,6 @@ protected:
     XMLDatabaseFieldImportContext(SvXMLImport& rImport,
                                   XMLTextImportHelper& rHlp,
                                   const char* pServiceName,
-                                  sal_uInt16 nPrfx,
-                                  const OUString& sLocalName,
                                   bool bUseDisplay );
 
 public:
@@ -380,9 +352,7 @@ class XMLDatabaseNameImportContext final : public XMLDatabaseFieldImportContext
 public:
 
     XMLDatabaseNameImportContext(SvXMLImport& rImport,
-                                 XMLTextImportHelper& rHlp,
-                                 sal_uInt16 nPrfx,
-                                 const OUString& sLocalName);
+                                 XMLTextImportHelper& rHlp);
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -401,16 +371,12 @@ protected:
     // for use in child classes
     XMLDatabaseNextImportContext(SvXMLImport& rImport,
                                  XMLTextImportHelper& rHlp,
-                                 const char* pServiceName,
-                                 sal_uInt16 nPrfx,
-                                 const OUString& sLocalName);
+                                 const char* pServiceName);
 
 public:
 
     XMLDatabaseNextImportContext(SvXMLImport& rImport,
-                                 XMLTextImportHelper& rHlp,
-                                 sal_uInt16 nPrfx,
-                                 const OUString& sLocalName);
+                                 XMLTextImportHelper& rHlp);
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -431,9 +397,7 @@ class XMLDatabaseSelectImportContext final : public XMLDatabaseNextImportContext
 public:
 
     XMLDatabaseSelectImportContext(SvXMLImport& rImport,
-                                   XMLTextImportHelper& rHlp,
-                                   sal_uInt16 nPrfx,
-                                   const OUString& sLocalName);
+                                   XMLTextImportHelper& rHlp);
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -458,9 +422,7 @@ class XMLDatabaseNumberImportContext final : public XMLDatabaseFieldImportContex
 public:
 
     XMLDatabaseNumberImportContext(SvXMLImport& rImport,
-                                   XMLTextImportHelper& rHlp,
-                                   sal_uInt16 nPrfx,
-                                   const OUString& sLocalName);
+                                   XMLTextImportHelper& rHlp);
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -488,9 +450,7 @@ public:
 
     XMLSimpleDocInfoImportContext(SvXMLImport& rImport,
                                   XMLTextImportHelper& rHlp,
-                                  sal_uInt16 nPrfx,
-                                  const OUString& sLocalName,
-                                  sal_uInt16 nToken,
+                                  sal_Int32 nElementToken,
                                   bool bContent,
                                   bool bAuthor);
 
@@ -503,7 +463,7 @@ protected:
     virtual void PrepareField(
         const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 
-    static const char* MapTokenToServiceName(sal_uInt16 nToken);
+    static const char* MapTokenToServiceName(sal_Int32 nElementToken);
 };
 
 /** import docinfo fields with date or time attributes and numberformats */
@@ -523,9 +483,7 @@ public:
 
     XMLDateTimeDocInfoImportContext(SvXMLImport& rImport,
                                     XMLTextImportHelper& rHlp,
-                                    sal_uInt16 nPrfx,
-                                    const OUString& sLocalName,
-                                    sal_uInt16 nToken);
+                                    sal_Int32 nElement);
 
 private:
     /// process attribute values
@@ -544,9 +502,7 @@ public:
 
     XMLRevisionDocInfoImportContext(SvXMLImport& rImport,
                                     XMLTextImportHelper& rHlp,
-                                    sal_uInt16 nPrfx,
-                                    const OUString& sLocalName,
-                                    sal_uInt16 nToken);
+                                    sal_Int32 nElement);
 
 private:
     /// prepare XTextField for insertion into document
@@ -569,9 +525,7 @@ public:
 
     XMLUserDocInfoImportContext(SvXMLImport& rImport,
                                 XMLTextImportHelper& rHlp,
-                                sal_uInt16 nPrfx,
-                                const OUString& sLocalName,
-                                sal_uInt16 nToken);
+                                sal_Int32 nElement);
 
 private:
     /// process attribute values
@@ -593,9 +547,7 @@ class XMLHiddenParagraphImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLHiddenParagraphImportContext(SvXMLImport& rImport,
-                                    XMLTextImportHelper& rHlp,
-                                    sal_uInt16 nPrfx,
-                                    const OUString& sLocalName);
+                                    XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -625,9 +577,7 @@ class XMLConditionalTextImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLConditionalTextImportContext(SvXMLImport& rImport,
-                                    XMLTextImportHelper& rHlp,
-                                    sal_uInt16 nPrfx,
-                                    const OUString& sLocalName);
+                                    XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -656,9 +606,7 @@ class XMLHiddenTextImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLHiddenTextImportContext(SvXMLImport& rImport,
-                               XMLTextImportHelper& rHlp,
-                               sal_uInt16 nPrfx,
-                               const OUString& sLocalName);
+                               XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -683,9 +631,7 @@ class XMLFileNameImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLFileNameImportContext(SvXMLImport& rImport,
-                             XMLTextImportHelper& rHlp,
-                             sal_uInt16 nPrfx,
-                             const OUString& sLocalName);
+                             XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -707,9 +653,7 @@ class XMLTemplateNameImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLTemplateNameImportContext(SvXMLImport& rImport,
-                                 XMLTextImportHelper& rHlp,
-                                 sal_uInt16 nPrfx,
-                                 const OUString& sLocalName);
+                                 XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -730,9 +674,7 @@ class XMLChapterImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLChapterImportContext(SvXMLImport& rImport,
-                            XMLTextImportHelper& rHlp,
-                            sal_uInt16 nPrfx,
-                            const OUString& sLocalName);
+                            XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -758,9 +700,7 @@ public:
 
     XMLCountFieldImportContext(SvXMLImport& rImport,
                                XMLTextImportHelper& rHlp,
-                               sal_uInt16 nPrfx,
-                               const OUString& sLocalName,
-                               sal_uInt16 nToken);
+                               sal_Int32 nElement);
 
 private:
     /// process attribute values
@@ -771,7 +711,7 @@ private:
     virtual void PrepareField(
         const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 
-    static const char* MapTokenToServiceName(sal_uInt16 nToken);
+    static const char* MapTokenToServiceName(sal_Int32 nElement);
 };
 
 /** import page variable fields (<text:get-page-variable>) */
@@ -785,9 +725,7 @@ class XMLPageVarGetFieldImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLPageVarGetFieldImportContext(SvXMLImport& rImport,
-                                    XMLTextImportHelper& rHlp,
-                                    sal_uInt16 nPrfx,
-                                    const OUString& sLocalName);
+                                    XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -808,9 +746,7 @@ class XMLPageVarSetFieldImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLPageVarSetFieldImportContext(SvXMLImport& rImport,
-                                    XMLTextImportHelper& rHlp,
-                                    sal_uInt16 nPrfx,
-                                    const OUString& sLocalName);
+                                    XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -835,9 +771,7 @@ class XMLMacroFieldImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLMacroFieldImportContext(SvXMLImport& rImport,
-                               XMLTextImportHelper& rHlp,
-                               sal_uInt16 nPrfx,
-                               const OUString& sLocalName);
+                               XMLTextImportHelper& rHlp);
 
 private:
     /// for <office:events> children
@@ -859,7 +793,7 @@ class XMLReferenceFieldImportContext final : public XMLTextFieldImportContext
 {
     OUString sName;
     OUString sLanguage;
-    sal_uInt16 nElementToken;
+    sal_Int32 nElementToken;
     sal_Int16 nSource;
     sal_Int16 nType;
 
@@ -870,9 +804,7 @@ public:
 
     XMLReferenceFieldImportContext(SvXMLImport& rImport,
                                    XMLTextImportHelper& rHlp,
-                                   sal_uInt16 nToken,
-                                   sal_uInt16 nPrfx,
-                                   const OUString& sLocalName);
+                                   sal_Int32 nToken);
 
 private:
     /// start element
@@ -894,9 +826,7 @@ class XMLDdeFieldDeclsImportContext final : public SvXMLImportContext
 {
 public:
 
-    XMLDdeFieldDeclsImportContext(SvXMLImport& rImport,
-                                  sal_uInt16 nPrfx,
-                                  const OUString& sLocalName);
+    XMLDdeFieldDeclsImportContext(SvXMLImport& rImport);
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
         sal_Int32 nElement,
@@ -925,9 +855,7 @@ class XMLDdeFieldImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLDdeFieldImportContext(SvXMLImport& rImport,
-                             XMLTextImportHelper& rHlp,
-                             sal_uInt16 nPrfx,
-                             const OUString& sLocalName);
+                             XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -949,9 +877,7 @@ class XMLSheetNameImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLSheetNameImportContext(SvXMLImport& rImport,
-                              XMLTextImportHelper& rHlp,
-                              sal_uInt16 nPrfx,
-                              const OUString& sLocalName);
+                              XMLTextImportHelper& rHlp);
 
 private:
     /// no attributes -> empty method
@@ -970,9 +896,7 @@ public:
 
     XMLPageNameFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -1013,17 +937,15 @@ class XMLBibliographyFieldImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLBibliographyFieldImportContext(SvXMLImport& rImport,
-                                      XMLTextImportHelper& rHlp,
-                                      sal_uInt16 nPrfx,
-                                      const OUString& sLocalName);
+                                      XMLTextImportHelper& rHlp);
 
 private:
     /// process attributes (fill aValues)
     virtual void SAL_CALL startFastElement(
         sal_Int32 nElement,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList> & xAttrList) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList) override;
 
-    /// empty method; all attributes are handled in startFastElement
+    /// empty method; all attributes are handled in StartElement
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
                                    const OUString& sAttrValue ) override;
 
@@ -1032,6 +954,7 @@ private:
         const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 
     static const char* MapBibliographyFieldName(const OUString& sName);
+    static const char* MapBibliographyFieldName(sal_Int32 nElement);
 };
 
 /** Import an annotation field (<text:annotation>) */
@@ -1048,15 +971,13 @@ class XMLAnnotationImportContext final : public XMLTextFieldImportContext
     css::uno::Reference < css::text::XTextCursor >  mxCursor;
     css::uno::Reference < css::text::XTextCursor >  mxOldCursor;
 
-    sal_uInt16 m_nToken;
+    sal_Int32 mnElement;
 
 public:
 
     XMLAnnotationImportContext(SvXMLImport& rImport,
                                XMLTextImportHelper& rHlp,
-                               sal_uInt16 nToken,
-                               sal_uInt16 nPrfx,
-                               const OUString& sLocalName);
+                               sal_Int32 nElement);
 
 private:
     /// process attributes
@@ -1084,9 +1005,7 @@ class XMLScriptImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLScriptImportContext(SvXMLImport& rImport,
-                           XMLTextImportHelper& rHlp,
-                           sal_uInt16 nPrfx,
-                           const OUString& sLocalName);
+                           XMLTextImportHelper& rHlp);
 
 private:
     /// process attributes
@@ -1106,9 +1025,7 @@ class XMLMeasureFieldImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLMeasureFieldImportContext(SvXMLImport& rImport,
-                                    XMLTextImportHelper& rHlp,
-                                    sal_uInt16 nPrfx,
-                                    const OUString& sLocalName);
+                                    XMLTextImportHelper& rHlp);
 
 private:
     /// process attribute values
@@ -1135,9 +1052,7 @@ class XMLDropDownFieldImportContext final : public XMLTextFieldImportContext
 public:
 
     XMLDropDownFieldImportContext(SvXMLImport& rImport,
-                                    XMLTextImportHelper& rHlp,
-                                    sal_uInt16 nPrfx,
-                                    const OUString& sLocalName);
+                                    XMLTextImportHelper& rHlp);
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
         sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override;
@@ -1159,9 +1074,7 @@ public:
 
     XMLHeaderFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -1179,9 +1092,7 @@ public:
 
     XMLFooterFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
@@ -1199,9 +1110,7 @@ public:
 
     XMLDateTimeFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
     /// process attribute values
     virtual void ProcessAttribute( sal_Int32 nAttrToken,
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 5cfca16c312b..8d0fb73bdd51 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -138,8 +138,6 @@ public:
         SvXMLImport& rImport,           /// XML Import
         XMLTextImportHelper& rHlp,      /// text import helper
         const char* pServiceName,   /// name of SO API service
-        sal_uInt16 nPrfx,               /// namespace prefix
-        const OUString& rLocalName,  /// element name w/o prefix
         // config variables for PrepareField behavior:
         bool bFormula,              /// set Formula property
         bool bFormulaDefault,       /// use content as default for formula
@@ -177,9 +175,7 @@ public:
 
     XMLVariableGetFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);             /// Text import helper
 
 
 private:
@@ -197,9 +193,7 @@ public:
 
     XMLExpressionFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// Text import helper
 
 private:
     virtual void PrepareField(
@@ -214,9 +208,7 @@ public:
 
     XMLTextInputFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& sLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);             /// Text import helper
 
 private:
     virtual void PrepareField(
@@ -241,8 +233,6 @@ public:
         SvXMLImport& rImport,           /// see XMLTextFieldImportContext
         XMLTextImportHelper& rHlp,      /// see XMLTextFieldImportContext
         const char* pServiceName,   /// see XMLTextFieldImportContext
-        sal_uInt16 nPrfx,               /// see XMLTextFieldImportContext
-        const OUString& rLocalName, /// see XMLTextFieldImportContext
         // for finding appropriate field master (see endFastElement())
         VarType eVarType,               /// variable type
         // config variables:
@@ -278,10 +268,8 @@ public:
 
     XMLVariableSetFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName);     /// element name w/o prefix
-
+        XMLTextImportHelper& rHlp);             /// Text import helper
+\
 private:
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
@@ -297,9 +285,7 @@ public:
 
     XMLVariableInputFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);             /// Text import helper
 
 private:
 
@@ -318,9 +304,7 @@ public:
 
     XMLUserFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);             /// Text import helper
 };
 
 /** user input fields (<text:user-field-input>) */
@@ -332,9 +316,7 @@ public:
 
     XMLUserFieldInputImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);             /// Text import helper
 
     virtual void PrepareField(
         const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
@@ -355,9 +337,7 @@ public:
 
     XMLSequenceFieldImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// Text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);             /// Text import helper
 
 private:
 
@@ -382,12 +362,9 @@ class XMLVariableDeclsImportContext final : public SvXMLImportContext
 
 public:
 
-
     XMLVariableDeclsImportContext(
         SvXMLImport& rImport,                   /// XML Import
         XMLTextImportHelper& rHlp,              /// text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName,      /// element name w/o prefix
         enum VarType eVarType);                 /// variable type
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
@@ -431,9 +408,7 @@ public:
 
     XMLTableFormulaImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);             /// text import helper
 
 private:
 
@@ -463,9 +438,7 @@ public:
 
     XMLDatabaseDisplayImportContext(
         SvXMLImport& rImport,                   /// XML Import
-        XMLTextImportHelper& rHlp,              /// text import helper
-        sal_uInt16 nPrfx,                       /// namespace prefix
-        const OUString& rLocalName);     /// element name w/o prefix
+        XMLTextImportHelper& rHlp);              /// text import helper
 
 private: