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>

14 files changed, 50 insertions, 50 deletions

diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx
index 27812771d8c2..596c596d97b4 100644
--- a/xmloff/source/style/PageHeaderFooterContext.hxx
+++ b/xmloff/source/style/PageHeaderFooterContext.hxx
@@ -25,8 +25,8 @@
 class PageHeaderFooterContext : public SvXMLImportContext
 {
     ::std::vector< XMLPropertyState > &     rProperties;
-    sal_Int32 const                         nStartIndex;
-    sal_Int32 const                         nEndIndex;
+    sal_Int32                               nStartIndex;
+    sal_Int32                               nEndIndex;
     bool                                bHeader;
     const rtl::Reference < SvXMLImportPropertyMapper > rMap;
 
diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx
index 912b19536aa7..603154d4e9c9 100644
--- a/xmloff/source/style/PageMasterPropHdl.hxx
+++ b/xmloff/source/style/PageMasterPropHdl.hxx
@@ -104,7 +104,7 @@ public:
 
 class XMLPMPropHdl_Print : public XMLPropertyHandler
 {
-    OUString const         sAttrValue;
+    OUString         sAttrValue;
 
 public:
     explicit XMLPMPropHdl_Print( enum ::xmloff::token::XMLTokenEnum eValue );
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index d6abd7cff68d..76a6a4d2bf33 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -51,12 +51,12 @@ namespace {
 
 class XMLFontAutoStylePoolEntry_Impl
 {
-    OUString const    sName;
-    OUString const    sFamilyName;
-    OUString const    sStyleName;
-    FontFamily const  nFamily;
-    FontPitch const   nPitch;
-    rtl_TextEncoding const eEnc;
+    OUString    sName;
+    OUString    sFamilyName;
+    OUString    sStyleName;
+    FontFamily  nFamily;
+    FontPitch   nPitch;
+    rtl_TextEncoding eEnc;
 
 public:
 
diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx
index 97c4d397b98e..e1baa2dd1ed0 100644
--- a/xmloff/source/style/XMLFontStylesContext_impl.hxx
+++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx
@@ -35,7 +35,7 @@ class XMLFontStyleContextFontFace : public SvXMLStyleContext
     css::uno::Any aPitch;
     css::uno::Any aEnc;
 
-    SvXMLImportContextRef const xStyles;
+    SvXMLImportContextRef xStyles;
 
     XMLFontStylesContext *GetStyles()
     {
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
index de916f5bc972..375b90826c27 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
@@ -41,7 +41,7 @@ class XMLFootnoteSeparatorImport : public SvXMLImportContext
 {
     ::std::vector<XMLPropertyState> & rProperties;
     rtl::Reference<XMLPropertySetMapper> rMapper;
-    sal_Int32 const nPropIndex;
+    sal_Int32 nPropIndex;
 
 public:
 
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index f936b82f7dda..ee28c11a75a3 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -45,8 +45,8 @@ enum class XmlStyleFamily;
 class XMLAutoStylePoolProperties
 {
     OUString                     msName;
-    ::std::vector< XMLPropertyState > const   maProperties;
-    sal_uInt32 const                          mnPos;
+    ::std::vector< XMLPropertyState >   maProperties;
+    sal_uInt32                          mnPos;
 
 public:
 
@@ -66,7 +66,7 @@ public:
     typedef std::vector<std::unique_ptr<XMLAutoStylePoolProperties>> PropertiesListType;
 
 private:
-    OUString const msParent;
+    OUString msParent;
     PropertiesListType m_PropertiesList;
 
 public:
@@ -101,8 +101,8 @@ struct XMLAutoStyleFamily
     typedef std::set<std::unique_ptr<XMLAutoStylePoolParent>,
         comphelper::UniquePtrValueLess<XMLAutoStylePoolParent>> ParentSetType;
 
-    XmlStyleFamily const mnFamily;
-    OUString const maStrFamilyName;
+    XmlStyleFamily mnFamily;
+    OUString maStrFamilyName;
     rtl::Reference<SvXMLExportPropertyMapper> mxMapper;
 
     ParentSetType m_ParentSet;
@@ -110,8 +110,8 @@ struct XMLAutoStyleFamily
     std::set<OUString> maReservedNameSet;
     sal_uInt32 mnCount;
     sal_uInt32 mnName;
-    OUString const maStrPrefix;
-    bool const mbAsFamily;
+    OUString maStrPrefix;
+    bool mbAsFamily;
 
     XMLAutoStyleFamily( XmlStyleFamily nFamily, const OUString& rStrName,
             const rtl::Reference<SvXMLExportPropertyMapper>& rMapper,
diff --git a/xmloff/source/style/prstylecond.cxx b/xmloff/source/style/prstylecond.cxx
index e384a645dffe..f644f5029be2 100644
--- a/xmloff/source/style/prstylecond.cxx
+++ b/xmloff/source/style/prstylecond.cxx
@@ -30,8 +30,8 @@ namespace {
 struct ConditionMap
 {
         char const* aInternal;
-        XMLTokenEnum const nExternal;
-        int const         aValue;
+        XMLTokenEnum nExternal;
+        int          aValue;
 };
 
 }
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index 31ca901d8379..a069dbd30fd0 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -35,8 +35,8 @@ namespace {
 
 struct FontWeightMapper
 {
-    float const fWeight;
-    sal_uInt16 const nValue;
+    float fWeight;
+    sal_uInt16 nValue;
 };
 
 }
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 4e6ce48b6c6d..c88488f4848b 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -29,7 +29,7 @@
 */
 class XMLNumberPropHdl : public XMLPropertyHandler
 {
-    sal_Int8 const nBytes;
+    sal_Int8 nBytes;
 
 public:
     explicit XMLNumberPropHdl( sal_Int8 nB ) : nBytes( nB ) {}
@@ -44,8 +44,8 @@ public:
 */
 class XMLNumberNonePropHdl : public XMLPropertyHandler
 {
-    OUString const sZeroStr;
-    sal_Int8 const nBytes;
+    OUString sZeroStr;
+    sal_Int8        nBytes;
 public:
     explicit XMLNumberNonePropHdl( sal_Int8 nB = 4 );
     XMLNumberNonePropHdl( enum ::xmloff::token::XMLTokenEnum eZeroString, sal_Int8 nB );
@@ -60,7 +60,7 @@ public:
 */
 class XMLMeasurePropHdl : public XMLPropertyHandler
 {
-    sal_Int8 const nBytes;
+    sal_Int8 nBytes;
 public:
     explicit XMLMeasurePropHdl( sal_Int8 nB ) : nBytes( nB ) {}
     virtual ~XMLMeasurePropHdl() override;
@@ -74,7 +74,7 @@ public:
 */
 class XMLPercentPropHdl : public XMLPropertyHandler
 {
-    sal_Int8 const nBytes;
+    sal_Int8 nBytes;
 public:
     explicit XMLPercentPropHdl( sal_Int8 nB ) : nBytes( nB ) {}
     virtual ~XMLPercentPropHdl() override;
@@ -98,7 +98,7 @@ class XMLDoublePercentPropHdl : public XMLPropertyHandler
 */
 class XMLNegPercentPropHdl : public XMLPropertyHandler
 {
-    sal_Int8 const nBytes;
+    sal_Int8 nBytes;
 public:
     explicit XMLNegPercentPropHdl( sal_Int8 nB ) : nBytes( nB ) {}
     virtual ~XMLNegPercentPropHdl() override;
@@ -112,7 +112,7 @@ public:
 */
 class XMLMeasurePxPropHdl : public XMLPropertyHandler
 {
-    sal_Int8 const nBytes;
+    sal_Int8 nBytes;
 public:
     explicit XMLMeasurePxPropHdl( sal_Int8 nB ) : nBytes( nB ) {}
     virtual ~XMLMeasurePxPropHdl() override;
@@ -236,7 +236,7 @@ public:
 class XMLIsTransparentPropHdl : public XMLPropertyHandler
 {
     const OUString sTransparent;
-    bool const bTransPropValue;
+    bool bTransPropValue;
 
 public:
     XMLIsTransparentPropHdl( enum ::xmloff::token::XMLTokenEnum eTransparent = xmloff::token::XML_TOKEN_INVALID,
@@ -294,7 +294,7 @@ public:
 */
 class XMLNumberWithoutZeroPropHdl : public XMLPropertyHandler
 {
-    sal_Int8 const        nBytes;
+    sal_Int8        nBytes;
 public:
     explicit XMLNumberWithoutZeroPropHdl( sal_Int8 nB );
     virtual ~XMLNumberWithoutZeroPropHdl() override;
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 76fd72c71deb..188f510c0fe8 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -58,8 +58,8 @@ namespace {
 
 struct XMLPropTokens_Impl
 {
-    sal_uInt16 const nType;
-    XMLTokenEnum const eToken;
+    sal_uInt16 nType;
+    XMLTokenEnum eToken;
 };
 
 const sal_uInt16 MAX_PROP_TYPES =
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 569cc072231c..de626f0e1661 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -59,9 +59,9 @@ namespace {
 
 struct SvXMLEmbeddedTextEntry
 {
-    sal_uInt16 const  nSourcePos;     // position in NumberFormat (to skip later)
-    sal_Int32 const   nFormatPos;     // resulting position in embedded-text element
-    OUString const    aText;
+    sal_uInt16      nSourcePos;     // position in NumberFormat (to skip later)
+    sal_Int32       nFormatPos;     // resulting position in embedded-text element
+    OUString   aText;
 
     SvXMLEmbeddedTextEntry( sal_uInt16 nSP, sal_Int32 nFP, const OUString& rT ) :
         nSourcePos(nSP), nFormatPos(nFP), aText(rT) {}
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 5edbb3055201..bfdf1671a127 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -51,8 +51,8 @@ namespace {
 
 struct SvXMLNumFmtEntry
 {
-    OUString const    aName;
-    sal_uInt32 const  nKey;
+    OUString   aName;
+    sal_uInt32  nKey;
     bool        bRemoveAfterUse;
 
     SvXMLNumFmtEntry( const OUString& rN, sal_uInt32 nK, bool bR ) :
@@ -118,7 +118,7 @@ namespace {
 class SvXMLNumFmtElementContext : public SvXMLImportContext
 {
     SvXMLNumFormatContext&  rParent;
-    sal_uInt16 const        nType;
+    sal_uInt16              nType;
     OUStringBuffer          aContent;
     SvXMLNumberInfo         aNumInfo;
     LanguageType            nElementLang;
@@ -309,15 +309,15 @@ namespace {
 
 struct SvXMLDefaultDateFormat
 {
-    NfIndexTableOffset const          eFormat;
-    SvXMLDateElementAttributes const  eDOW;
-    SvXMLDateElementAttributes const  eDay;
-    SvXMLDateElementAttributes const  eMonth;
-    SvXMLDateElementAttributes const  eYear;
-    SvXMLDateElementAttributes const  eHours;
-    SvXMLDateElementAttributes const  eMins;
-    SvXMLDateElementAttributes const  eSecs;
-    bool const                        bSystem;
+    NfIndexTableOffset          eFormat;
+    SvXMLDateElementAttributes  eDOW;
+    SvXMLDateElementAttributes  eDay;
+    SvXMLDateElementAttributes  eMonth;
+    SvXMLDateElementAttributes  eYear;
+    SvXMLDateElementAttributes  eHours;
+    SvXMLDateElementAttributes  eMins;
+    SvXMLDateElementAttributes  eSecs;
+    bool                        bSystem;
 };
 
 }
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index ae84852baa12..9d20baa86f08 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -91,7 +91,7 @@ struct XMLPropertySetMapper::Impl
     std::vector<XMLPropertySetMapperEntry_Impl> maMapEntries;
     std::vector<rtl::Reference <XMLPropertyHandlerFactory> > maHdlFactories;
 
-    bool const mbOnlyExportMappings;
+    bool mbOnlyExportMappings;
 
     explicit Impl( bool bForExport ) : mbOnlyExportMappings(bForExport) {}
 };
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index d0ae0db93ece..cba7ac8a37d4 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -246,7 +246,7 @@ class SvXMLStylesContext_Impl
 
     std::vector<rtl::Reference<SvXMLStyleContext>> aStyles;
     mutable std::unique_ptr<IndicesType> pIndices;
-    bool const bAutomaticStyle;
+    bool bAutomaticStyle;
 
 #if OSL_DEBUG_LEVEL > 0
     mutable sal_uInt32 m_nIndexCreated;