Revert "loplugin:constfields in xmloff"

This reverts commit 0302c9b192c3b7ba10daabed61d6864c24c14070.

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

22 files changed, 33 insertions, 33 deletions

diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx
index 272ea33e9b30..aa1b3585a3b0 100644
--- a/include/xmloff/ProgressBarHelper.hxx
+++ b/include/xmloff/ProgressBarHelper.hxx
@@ -36,7 +36,7 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper
             sal_Int32                                             nReference;
             sal_Int32                                             nValue;
             double                                                fOldPercent;
-            bool const                                            bStrict;
+            bool                                                  bStrict;
             // #96469#; if the value goes over the Range the progressbar starts again
             bool                                                  bRepeat;
 
diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx
index 75ec174f5b92..052aeef6ee93 100644
--- a/include/xmloff/SinglePropertySetInfoCache.hxx
+++ b/include/xmloff/SinglePropertySetInfoCache.hxx
@@ -34,7 +34,7 @@ class SinglePropertySetInfoCache
     typedef std::map<css::uno::Reference<css::beans::XPropertySetInfo>, bool>
         Map;
 
-    OUString const sName;
+    OUString sName;
     Map map_;
 
 public:
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index 9cdfa63402be..364878e38dfe 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -28,7 +28,7 @@ class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext
 {
     XMLCharContext(const XMLCharContext&) = delete;
     void operator =(const XMLCharContext&) = delete;
-    sal_Int16 const   m_nControl;
+    sal_Int16   m_nControl;
 protected:
     sal_uInt16  m_nCount;
     sal_Unicode m_c;
diff --git a/include/xmloff/XMLFontAutoStylePool.hxx b/include/xmloff/XMLFontAutoStylePool.hxx
index 59ca1414078b..2354bcf8ce7d 100644
--- a/include/xmloff/XMLFontAutoStylePool.hxx
+++ b/include/xmloff/XMLFontAutoStylePool.hxx
@@ -40,7 +40,7 @@ private:
 
     std::unique_ptr<XMLFontAutoStylePool_Impl> m_pFontAutoStylePool;
     std::set<OUString> m_aNames;
-    bool const m_bTryToEmbedFonts;
+    bool m_bTryToEmbedFonts;
     std::unordered_map<OString, OUString> m_aEmbeddedFontFiles;
 
     OUString embedFontFile(OUString const & rFileUrl, OUString const & rFamilyName);
diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx
index 5f97f9b772aa..b10bf2797b14 100644
--- a/include/xmloff/XMLFontStylesContext.hxx
+++ b/include/xmloff/XMLFontStylesContext.hxx
@@ -43,7 +43,7 @@ class XMLOFF_DLLPUBLIC XMLFontStylesContext final : public SvXMLStylesContext
 
     std::unique_ptr<SvXMLTokenMap>           pFontStyleAttrTokenMap;
 
-    rtl_TextEncoding const        eDfltEncoding;
+    rtl_TextEncoding        eDfltEncoding;
 
     virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
         const OUString& rLocalName,
diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx
index 1a767ff50781..6ec2cb2dab1e 100644
--- a/include/xmloff/controlpropertyhdl.hxx
+++ b/include/xmloff/controlpropertyhdl.hxx
@@ -75,7 +75,7 @@ namespace xmloff
         virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
 
     private:
-        BorderFacet const m_eFacet;
+        BorderFacet m_eFacet;
     };
 
 
diff --git a/include/xmloff/i18nmap.hxx b/include/xmloff/i18nmap.hxx
index 20953d147f2e..c3921281f70f 100644
--- a/include/xmloff/i18nmap.hxx
+++ b/include/xmloff/i18nmap.hxx
@@ -27,8 +27,8 @@
 
 class SvI18NMapEntry_Key
 {
-    sal_uInt16 const      nKind;
-    OUString const   aName;
+    sal_uInt16      nKind;
+    OUString   aName;
 public:
     SvI18NMapEntry_Key( sal_uInt16 nKnd, const OUString& rName ) :
         nKind( nKnd ),
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index 9e0292e6380e..0c32b595f3f7 100644
--- a/include/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
@@ -36,7 +36,7 @@ class SvXMLExport;
 struct XMLNumberFormat
 {
     OUString   sCurrency;
-    sal_Int32 const  nNumberFormat;
+    sal_Int32  nNumberFormat;
     sal_Int16  nType;
     bool       bIsStandard : 1;
 
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index dced149b4289..d34fd4527644 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -42,7 +42,7 @@ class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext
 private:
     ::std::vector< XMLPropertyState >          maProperties;
     css::uno::Reference < css::style::XStyle > mxStyle;
-    SvXMLImportContextRef const                mxStyles;
+    SvXMLImportContextRef                      mxStyles;
 
     XMLPropStyleContext(XMLPropStyleContext const &) = delete;
     XMLPropStyleContext& operator =(XMLPropStyleContext const &) = delete;
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 12fe2aea6b08..4ccd94d9e432 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -199,7 +199,7 @@ class SvXMLShapeContext : public SvXMLImportContext
 {
 protected:
     css::uno::Reference< css::drawing::XShape >   mxShape;
-    bool const                                    mbTemporaryShape;
+    bool                                          mbTemporaryShape;
     OUString                                      msHyperlink;
 
 public:
diff --git a/include/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx
index 92173b31b2b0..bedef86e654c 100644
--- a/include/xmloff/xmlement.hxx
+++ b/include/xmloff/xmlement.hxx
@@ -33,8 +33,8 @@ template<typename EnumT>
 struct SvXMLEnumMapEntry
 {
 private:
-    ::xmloff::token::XMLTokenEnum const   eToken;
-    sal_uInt16 const                      nValue;
+    ::xmloff::token::XMLTokenEnum   eToken;
+    sal_uInt16                      nValue;
 public:
     SvXMLEnumMapEntry(::xmloff::token::XMLTokenEnum eToken_, EnumT nValue_)
         : eToken(eToken_), nValue(static_cast<sal_uInt16>(nValue_)) {}
@@ -71,8 +71,8 @@ struct SvXMLEnumStringMapEntry
 {
 private:
     const char *    pName;
-    sal_Int32 const       nNameLength;
-    sal_uInt16 const      nValue;
+    sal_Int32       nNameLength;
+    sal_uInt16      nValue;
 public:
     SvXMLEnumStringMapEntry(const char * pName_, sal_Int32 nNameLength_, EnumT nValue_)
         : pName(pName_), nNameLength(nNameLength_), nValue(nValue_) {}
diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx
index ebbd400755fc..f365a2ce4417 100644
--- a/include/xmloff/xmlevent.hxx
+++ b/include/xmloff/xmlevent.hxx
@@ -75,7 +75,7 @@ struct XMLEventName
 struct XMLEventNameTranslation
 {
     const char* sAPIName;
-    sal_uInt16 const nPrefix;    // namespace prefix
+    sal_uInt16 nPrefix;    // namespace prefix
     const char* sXMLName;
 };
 
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 0ff26a843d45..e1c9b2eb6129 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -118,7 +118,7 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public cppu::WeakImplHelper<
     std::unique_ptr<SvXMLExport_Impl>            mpImpl;            // dummy
 
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
-    OUString const m_implementationName;
+    OUString m_implementationName;
 
     css::uno::Reference< css::frame::XModel > mxModel;
     css::uno::Reference< css::xml::sax::XDocumentHandler >            mxHandler;      // the handlers
@@ -228,8 +228,8 @@ protected:
 
     struct SettingsGroup
     {
-        ::xmloff::token::XMLTokenEnum const                     eGroupName;
-        css::uno::Sequence< css::beans::PropertyValue > const   aSettings;
+        ::xmloff::token::XMLTokenEnum                     eGroupName;
+        css::uno::Sequence< css::beans::PropertyValue >   aSettings;
 
         SettingsGroup(
                 const ::xmloff::token::XMLTokenEnum _eGroupName,
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 5bcd2531c845..19bb0b7b5358 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -214,7 +214,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper<
 
     SAL_DLLPRIVATE void InitCtor_();
 
-    SvXMLImportFlags const  mnImportFlags;
+    SvXMLImportFlags  mnImportFlags;
     std::set< OUString > embeddedFontUrlsKnown;
     bool isFastContext;
     css::uno::Reference< css::xml::sax::XFastParser > mxParser;
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index d77d434b3ab5..de10dd3b7b10 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -53,7 +53,7 @@ class SvXMLImport;
  */
 struct ContextID_Index_Pair
 {
-    sal_Int16 const nContextID;
+    sal_Int16 nContextID;
     sal_Int32 nIndex;
 };
 
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 71e25bd2b907..3798c7bd6977 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -48,7 +48,7 @@ class XMLOFF_DLLPUBLIC SvXMLNumFmtExport final
 {
 private:
     SvXMLExport&                rExport;
-    OUString const              sPrefix;
+    OUString                    sPrefix;
     SvNumberFormatter*          pFormatter;
     OUStringBuffer       sTextContent;
     std::unique_ptr<SvXMLNumUsedList_Impl>      pUsedList;
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 4a1eaca5b256..a37335ef67bc 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -117,9 +117,9 @@ struct MyCondition
 class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
 {
     SvXMLNumImpData*    pData;
-    SvXMLStylesContext* const   pStyles;
+    SvXMLStylesContext*             pStyles;
     std::vector <MyCondition>   aMyConditions;
-    sal_uInt16 const          nType;
+    sal_uInt16          nType;
     sal_Int32           nKey;
 //  OUString       sFormatName;
     OUString       sFormatTitle;
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 654583a37563..ca82d8f55295 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -41,7 +41,7 @@ class XMLOFF_DLLPUBLIC SvxXMLListStyleContext final
     std::unique_ptr<SvxXMLListStyle_Impl> pLevelStyles;
 
     bool                        bConsecutive : 1;
-    bool const                  bOutline : 1;
+    bool                        bOutline : 1;
 
     SAL_DLLPRIVATE virtual void SetAttribute( sal_uInt16 nPrefixKey,
                                const OUString& rLocalName,
diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx
index dc528233e187..a0219b3742d9 100644
--- a/include/xmloff/xmlprcon.hxx
+++ b/include/xmloff/xmlprcon.hxx
@@ -30,9 +30,9 @@ struct XMLPropertyState;
 class XMLOFF_DLLPUBLIC SvXMLPropertySetContext : public SvXMLImportContext
 {
 protected:
-    sal_Int32 const mnStartIdx;
-    sal_Int32 const mnEndIdx;
-    sal_uInt32 const mnFamily;
+    sal_Int32 mnStartIdx;
+    sal_Int32 mnEndIdx;
+    sal_uInt32 mnFamily;
     ::std::vector< XMLPropertyState > &mrProperties;
     rtl::Reference < SvXMLImportPropertyMapper >   mxMapper;
 
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index c728f0e5b501..7b81350e2c31 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -72,7 +72,7 @@ class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext
                               // by Finish() or si somehow invalid.
     bool         mbNew : 1;   // Set this to false in CreateAnsInsert
                               // if the style is already existing.
-    bool const   mbDefaultStyle : 1;
+    bool         mbDefaultStyle : 1;
 
 protected:
 
diff --git a/include/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx
index df4de8e4848f..0449a27d184e 100644
--- a/include/xmloff/xmltkmap.hxx
+++ b/include/xmloff/xmltkmap.hxx
@@ -34,10 +34,10 @@ class SvXMLTokenMap_Impl;
 
 struct SvXMLTokenMapEntry
 {
-    enum xmloff::token::XMLTokenEnum const eLocalName;
+    enum xmloff::token::XMLTokenEnum eLocalName;
     sal_Int32 nFastToken;
-    sal_uInt16 const  nPrefixKey;
-    sal_uInt16 const  nToken;
+    sal_uInt16 nPrefixKey;
+    sal_uInt16 nToken;
 
     SvXMLTokenMapEntry( sal_uInt16 nPrefix, xmloff::token::XMLTokenEnum eName,
                         sal_uInt16 nTok, sal_Int32 nFastTok = 0 ) :
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index a17c7d0deea6..cbeb41907b16 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -56,7 +56,7 @@ class XMLOFF_DLLPUBLIC SvXMLTokenEnumerator
 private:
     const OUString&  maTokenString;
     sal_Int32               mnNextTokenPos;
-    sal_Unicode const       mcSeparator;
+    sal_Unicode             mcSeparator;
 
 public:
     SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeparator = u' ' );