Revert "loplugin:constfields in sw"

This reverts commit 4969f4c0d3e2581aaa8a5b5a5769840fa6b6f8ea.

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

42 files changed, 139 insertions, 139 deletions

diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 933f7510c6e8..6aa5867377eb 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -205,8 +205,8 @@ class SwEnhancedPDFExportHelper
      * in a page range without empty pages, or -1 if this page is empty. */
     std::vector< sal_Int32 > maPageNumberMap;
 
-    bool const mbSkipEmptyPages;
-    bool const mbEditEngineOnly;
+    bool mbSkipEmptyPages;
+    bool mbEditEngineOnly;
 
     const SwPrintData& mrPrintData;
 
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index 91938ebfe0a5..5b62429a1336 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -44,8 +44,8 @@ public:
 class SwUndoFieldFromDoc final : public SwUndoField
 {
     std::unique_ptr<SwField> pOldField, pNewField;
-    SwMsgPoolItem * const pHint;
-    bool const bUpdate;
+    SwMsgPoolItem * pHint;
+    bool bUpdate;
 
     void DoImpl();
 
@@ -64,7 +64,7 @@ public:
 class SwUndoFieldFromAPI final : public SwUndoField
 {
     css::uno::Any aOldVal, aNewVal;
-    sal_uInt16 const nWhich;
+    sal_uInt16 nWhich;
 
     void DoImpl();
 
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 989f9aff19ec..e53c537b758e 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -61,8 +61,8 @@ private:
         StartedLink(sal_Int32 startPosition, const OUString& characterStyle) :
                 mStartPosition(startPosition), mCharacterStyle(characterStyle) {
         }
-        sal_Int32 const mStartPosition;
-        OUString const mCharacterStyle;
+        sal_Int32 mStartPosition;
+        OUString mCharacterStyle;
     };
 
     /** A link that has been encountered while parsing a tox.
@@ -76,8 +76,8 @@ private:
         {
         }
         SwFormatINetFormat mINetFormat;
-        sal_Int32 const mStartTextPos;
-        sal_Int32 const mEndTextPos;
+        sal_Int32 mStartTextPos;
+        sal_Int32 mEndTextPos;
     };
 
     std::vector<std::unique_ptr<ClosedLink>> m_ClosedLinks;
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx
index f951fb229583..5282f6897aaf 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -100,10 +100,10 @@ private:
     long
     CalculatePageMarginFromPageDescription(const SwTextNode& targetNode) const;
 
-    sal_uInt32 const mIndexOfSectionNode;
+    sal_uInt32 mIndexOfSectionNode;
     const SwPageDesc& mDefaultPageDescription;
-    bool const mTabPositionIsRelativeToParagraphIndent;
-    TabStopReferencePolicy const mTabStopReferencePolicy;
+    bool mTabPositionIsRelativeToParagraphIndent;
+    TabStopReferencePolicy mTabStopReferencePolicy;
 };
 
 }
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 9f2aa0daf5fe..1641c6fc0dc8 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -120,7 +120,7 @@ class SwAccessibleMap final : public ::accessibility::IAccessibleViewForwarder,
     //mpSelectedFrameMap contains the old selected objects.
     std::unique_ptr<SwAccessibleContextMap_Impl> mpSeletedFrameMap;
 
-    OUString const maDocName;
+    OUString maDocName;
 
     //InvalidateShapeInParaSelection() method is responsible for the updating the selected states of the objects.
     void InvalidateShapeInParaSelection();
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index ede55a43310b..78b62b4be607 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -39,7 +39,7 @@ class SwAutoCompleteWord
 
     /// contains extended strings carrying source information
     editeng::SortedAutoCompleteStrings m_WordList;
-    editeng::Trie const m_LookupTree;
+    editeng::Trie m_LookupTree;
     SwAutoCompleteStringPtrDeque m_aLRUList;
 
     std::unique_ptr<SwAutoCompleteWord_Impl> m_pImpl;
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index bf3fef1711f9..86e33f4cb618 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -194,7 +194,7 @@ class SwCalc
     sal_Int32   m_nCommandPos;
 
     SwDoc&      m_rDoc;
-    SvtSysLocale const m_aSysLocale;
+    SvtSysLocale m_aSysLocale;
     const LocaleDataWrapper* m_pLocaleDataWrapper;
     CharClass*  m_pCharClass;
 
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index b4d94c5c483f..29eafc11240c 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -30,8 +30,8 @@ enum class Master_CollCondition;
 
 struct CommandStruct
 {
-    Master_CollCondition const nCnd;
-    sal_uLong const nSubCond;
+    Master_CollCondition nCnd;
+    sal_uLong nSubCond;
 };
 
 sal_Int16       GetCommandContextIndex( const OUString &rContextName );
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 7d7dcd705559..845e98da8dff 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -43,7 +43,7 @@ struct SwFillCursorPos
     sal_uInt16 nSpaceOnlyCnt;   ///< number of spaces to insert ("only spaces, no tabs" mode)
     sal_uInt16 nColumnCnt;      ///< number of necessary column breaks
     sal_Int16  eOrient;      ///< paragraph alignment
-    SwFillMode const eMode; ///< desired fill-up rule
+    SwFillMode eMode;       ///< desired fill-up rule
     SwFillCursorPos( SwFillMode eMd ) :
         nParaCnt( 0 ), nTabCnt( 0 ), nSpaceCnt( 0 ), nSpaceOnlyCnt(0), nColumnCnt( 0 ),
         eOrient( css::text::HoriOrientation::NONE ), eMode( eMd )
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index f1965acdfc95..03f3ab74d11d 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -50,7 +50,7 @@ namespace sw
 // FieldType for DDE
 class SW_DLLPUBLIC SwDDEFieldType final : public SwFieldType
 {
-    OUString const aName;
+    OUString aName;
     OUString aExpansion;
 
     tools::SvRef<sfx2::SvBaseLink> refLink;
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 5fd4212eeea2..5c8187dafa13 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -377,7 +377,7 @@ public:
 
 class SAL_DLLPUBLIC_RTTI SwMacroFieldType final : public SwFieldType
 {
-    SwDoc* const m_pDoc;
+    SwDoc* m_pDoc;
 
 public:
     SwMacroFieldType(SwDoc*);
@@ -426,7 +426,7 @@ public:
 class SAL_DLLPUBLIC_RTTI SwPostItFieldType final : public SwFieldType
 {
 private:
-    SwDoc* const mpDoc;
+    SwDoc* mpDoc;
 public:
     SwPostItFieldType(SwDoc* pDoc);
 
@@ -678,7 +678,7 @@ public:
 
 class SwScriptFieldType final : public SwFieldType
 {
-    SwDoc* const m_pDoc;
+    SwDoc* m_pDoc;
 public:
     SwScriptFieldType( SwDoc* pDoc );
 
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 53b91f44db98..f19687c4d307 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -118,7 +118,7 @@ enum class ParaBreakType {
  /// For querying the INet-attributes for Navigator.
 struct SwGetINetAttr
 {
-    OUString const sText;
+    OUString sText;
     const SwTextINetFormat& rINetAttr;
 
     SwGetINetAttr( const OUString& rText, const SwTextINetFormat& rAttr )
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 18ae54ccd834..95673e62b2c8 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -144,7 +144,7 @@ class SwSetExpField;
 
 class SW_DLLPUBLIC SwSetExpFieldType final : public SwValueFieldType
 {
-    OUString const m_sName;
+    OUString       m_sName;
     OUString      m_sDelim;
     sal_uInt16      m_nType;
     sal_uInt8       m_nLevel;
@@ -270,7 +270,7 @@ inline bool SwSetExpField::IsSequenceField() const
 
 class SAL_DLLPUBLIC_RTTI SwInputFieldType final : public SwFieldType
 {
-    SwDoc* const mpDoc;
+    SwDoc* mpDoc;
 public:
     SwInputFieldType( SwDoc* pDoc );
 
@@ -286,7 +286,7 @@ class SW_DLLPUBLIC SwInputField final : public SwField
     OUString maHelp;
     OUString maToolTip;
     sal_uInt16 mnSubType;
-    bool const mbIsFormField;
+    bool mbIsFormField;
 
     SwFormatField* mpFormatField; // attribute to which the <SwInputField> belongs to
 
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 1cd3b0f85c68..10c4faa78adf 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -241,7 +241,7 @@ class SW_DLLPUBLIC SwFieldType : public SwModify, public sw::BroadcasterMixin
 {
     css::uno::WeakReference<css::beans::XPropertySet> m_wXFieldMaster;
 
-    SwFieldIds const m_nWhich;
+    SwFieldIds m_nWhich;
 
     friend void FinitUI();     ///< In order to delete pointer!
     static  std::vector<OUString>* s_pFieldNames;
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 13145771096a..1f26be54263e 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -162,7 +162,7 @@ enum class SwFormatFieldHintWhich
 class SW_DLLPUBLIC SwFormatFieldHint final : public SfxHint
 {
     const SwFormatField*   m_pField;
-    SwFormatFieldHintWhich const m_nWhich;
+    SwFormatFieldHintWhich m_nWhich;
     const SwView*     m_pView;
 
 public:
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 08b4d11c86ad..1a9e634dc91b 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -32,7 +32,7 @@ class IntlWrapper;
 
 class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient
 {
-    bool const m_bActive;       ///< Only for controlling (creation of content).
+    bool m_bActive;       ///< Only for controlling (creation of content).
 
 public:
     SwFormatHeader( bool bOn = false );
@@ -63,7 +63,7 @@ public:
 
 class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient
 {
-    bool const m_bActive;       // Only for controlling (creation of content).
+    bool m_bActive;       // Only for controlling (creation of content).
 
 public:
     SwFormatFooter( bool bOn = false );
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index a7f9fa8d9b57..d739925f81f4 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -268,7 +268,7 @@ namespace sw
     };
     struct DrawFrameFormatHint final: SfxHint
     {
-        DrawFrameFormatHintId const m_eId;
+        DrawFrameFormatHintId m_eId;
         DrawFrameFormatHint(DrawFrameFormatHintId eId) : m_eId(eId) {};
         virtual ~DrawFrameFormatHint() override;
     };
diff --git a/sw/inc/gotodlg.hxx b/sw/inc/gotodlg.hxx
index 0c79484553aa..a7971bec225f 100644
--- a/sw/inc/gotodlg.hxx
+++ b/sw/inc/gotodlg.hxx
@@ -37,7 +37,7 @@ public:
 
 private:
     SwView       *m_pCreateView;
-    SfxBindings * const m_rBindings;
+    SfxBindings  *m_rBindings;
     sal_uInt16   mnMaxPageCnt;
 
     std::unique_ptr<weld::Entry> mxMtrPageCtrl;
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index f43fd0c1dd3d..55d0f99ddb82 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -80,7 +80,7 @@ public:
 class SAL_DLLPUBLIC_RTTI SwRotationGrf : public SfxUInt16Item
 {
 private:
-    Size const m_aUnrotatedSize;
+    Size m_aUnrotatedSize;
 
     // tdf#115529 check and evtl. correct value, it is in 10th
     // degrees and *has* to be in the range [0 .. 3600[
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index d627eda0988c..17874777c882 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion
     bool        m_bIsDrawObj;
     bool        m_bIsOtherContent;
     bool        m_bStartChk;
-    bool const  m_bIsSelection;       ///< true if only the selected text should be converted
+    bool        m_bIsSelection;       ///< true if only the selected text should be converted
     bool        m_bStartDone;
     bool        m_bEndDone;
 
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index bb322c4c640a..9a79579c16ef 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -64,15 +64,15 @@ public:
 class SwFormatChg final : public SwMsgPoolItem
 {
 public:
-    SwFormat * const pChangedFormat;
+    SwFormat *pChangedFormat;
     SwFormatChg( SwFormat *pFormat );
 };
 
 class SwInsText final : public SwMsgPoolItem
 {
 public:
-    sal_Int32 const nPos;
-    sal_Int32 const nLen;
+    sal_Int32 nPos;
+    sal_Int32 nLen;
 
     SwInsText( sal_Int32 nP, sal_Int32 nL );
 };
@@ -80,7 +80,7 @@ public:
 class SwDelChr final : public SwMsgPoolItem
 {
 public:
-    sal_Int32 const nPos;
+    sal_Int32 nPos;
 
     SwDelChr( sal_Int32 nP );
 };
@@ -88,8 +88,8 @@ public:
 class SwDelText final : public SwMsgPoolItem
 {
 public:
-    sal_Int32 const nStart;
-    sal_Int32 const nLen;
+    sal_Int32 nStart;
+    sal_Int32 nLen;
 
     SwDelText( sal_Int32 nS, sal_Int32 nL );
 };
@@ -112,8 +112,8 @@ public:
 class RedlineDelText final : public SfxHint
 {
 public:
-    sal_Int32 const nStart;
-    sal_Int32 const nLen;
+    sal_Int32 nStart;
+    sal_Int32 nLen;
 
     RedlineDelText(sal_Int32 nS, sal_Int32 nL);
 };
@@ -133,9 +133,9 @@ public:
 class SwUpdateAttr final : public SwMsgPoolItem
 {
 private:
-    sal_Int32 const m_nStart;
-    sal_Int32 const m_nEnd;
-    sal_uInt16 const m_nWhichAttr;
+    sal_Int32 m_nStart;
+    sal_Int32 m_nEnd;
+    sal_uInt16 m_nWhichAttr;
     std::vector<sal_uInt16> m_aWhichFmtAttrs; // attributes changed inside RES_TXTATR_AUTOFMT
 
 public:
@@ -227,7 +227,7 @@ public:
  */
 class SwAttrSetChg final : public SwMsgPoolItem
 {
-    bool const m_bDelSet;
+    bool m_bDelSet;
     SwAttrSet* m_pChgSet;           ///< what has changed
     const SwAttrSet* m_pTheChgdSet; ///< is only used to compare
 public:
@@ -254,7 +254,7 @@ public:
 class SwCondCollCondChg final : public SwMsgPoolItem
 {
 public:
-    SwFormat * const pChangedFormat;
+    SwFormat *pChangedFormat;
     SwCondCollCondChg( SwFormat *pFormat );
 };
 
@@ -287,7 +287,7 @@ public:
 
 class SwStringMsgPoolItem final : public SwMsgPoolItem
 {
-    OUString const m_sStr;
+    OUString m_sStr;
 public:
 
     const OUString& GetString() const { return m_sStr; }
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 88b9839bdee5..8ed20b83fb36 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -54,7 +54,7 @@ class SwHTMLTableLayoutCnts
     sal_uInt8 nPass1Done;           ///< How many times has Pass 1 been called?
     sal_uInt8 nWidthSet;            ///< How many times has the width been set?
 
-    bool const bNoBreakTag;           ///< <NOBR>-Tag over complete content.
+    bool bNoBreakTag;           ///< <NOBR>-Tag over complete content.
 
 public:
 
@@ -86,10 +86,10 @@ class SwHTMLTableLayoutCell
 
     sal_uInt16 nRowSpan;               ///< ROWSPAN of cell.
     sal_uInt16 nColSpan;               ///< COLSPAN of cell.
-    sal_uInt16 const nWidthOption;           ///< Given width of cell in Twip or %.
+    sal_uInt16 nWidthOption;           ///< Given width of cell in Twip or %.
 
-    bool const bPercentWidthOption : 1;  ///< nWidth is %-value.
-    bool const bNoWrapOption : 1;        ///< NOWRAP-option.
+    bool bPercentWidthOption : 1;  ///< nWidth is %-value.
+    bool bNoWrapOption : 1;        ///< NOWRAP-option.
 
 public:
 
@@ -131,7 +131,7 @@ class SwHTMLTableLayoutColumn
     sal_uInt16 nWidthOption;                ///< Options of <COL> or <TD>/<TH>.
 
     bool bRelWidthOption : 1;
-    bool const bLeftBorder : 1;
+    bool bLeftBorder : 1;
 
 public:
 
@@ -178,11 +178,11 @@ class SwHTMLTableLayout
     sal_uLong m_nMin;                     ///< Minimal width of table (Twips).
     sal_uLong m_nMax;                     ///< Maximal width of table (Twips).
 
-    sal_uInt16 const m_nRows;                   ///< Row count.
+    sal_uInt16 m_nRows;                   ///< Row count.
     sal_uInt16 m_nCols;                   ///< Column count.
 
-    sal_uInt16 const m_nLeftMargin;             ///< Space to left margin (from paragraph).
-    sal_uInt16 const m_nRightMargin;            ///< Space to left margin (from paragraph).
+    sal_uInt16 m_nLeftMargin;             ///< Space to left margin (from paragraph).
+    sal_uInt16 m_nRightMargin;            ///< Space to left margin (from paragraph).
 
     sal_uInt16 m_nInhAbsLeftSpace;        ///< Space inherited from surrounding box
     sal_uInt16 m_nInhAbsRightSpace;       ///< that was added to boxes.
@@ -193,16 +193,16 @@ class SwHTMLTableLayout
     sal_uInt16 m_nRelTabWidth;            ///< Relative width of table.
 
     sal_uInt16 m_nWidthOption;            ///< Width of table (in Twips or %).
-    sal_uInt16 const m_nCellPadding;            ///< Space to contents (in Twips).
-    sal_uInt16 const m_nCellSpacing;            ///< Cell spacing (in Twips).
-    sal_uInt16 const m_nBorder;                 /** Line strength of outer border, or rather the
+    sal_uInt16 m_nCellPadding;            ///< Space to contents (in Twips).
+    sal_uInt16 m_nCellSpacing;            ///< Cell spacing (in Twips).
+    sal_uInt16 m_nBorder;                 /** Line strength of outer border, or rather the
                                         space needed for it as calculated by Netscape. */
 
-    SwTwips const m_nLeftBorderWidth;
-    SwTwips const m_nRightBorderWidth;
+    SwTwips m_nLeftBorderWidth;
+    SwTwips m_nRightBorderWidth;
     sal_uInt16 m_nInhLeftBorderWidth;
     sal_uInt16 m_nInhRightBorderWidth;
-    SwTwips const m_nBorderWidth;
+    SwTwips m_nBorderWidth;
 
     sal_uInt16 m_nDelayedResizeAbsAvail;  ///< Param for delayed Resize.
     sal_uInt16 m_nLastResizeAbsAvail;
@@ -210,11 +210,11 @@ class SwHTMLTableLayout
     sal_uInt8 m_nPass1Done;               ///< Reference-values for
     sal_uInt8 m_nWidthSet;                ///< the runs through loop.
 
-    SvxAdjust const m_eTableAdjust;             ///< Alignment of table.
+    SvxAdjust m_eTableAdjust;             ///< Alignment of table.
 
-    bool const m_bColsOption : 1;           ///< Table has a COLS-option.
-    bool const m_bColTags : 1;              ///< Table has COL/COLGRP tags.
-    bool const m_bPercentWidthOption : 1;       ///< Width is given in percent.
+    bool m_bColsOption : 1;           ///< Table has a COLS-option.
+    bool m_bColTags : 1;              ///< Table has COL/COLGRP tags.
+    bool m_bPercentWidthOption : 1;       ///< Width is given in percent.
     bool m_bUseRelWidth : 1;          ///< SwTable gets relative width.
 
     bool m_bMustResize : 1;           ///< Table width must be defined.
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 58b721af8007..7020bd431bb7 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -128,7 +128,7 @@ class SAL_DLLPUBLIC_RTTI SwInsertConfig final : public utl::ConfigItem
     bool            m_bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering
 
     SwInsertTableOptions    m_aInsTableOpts;
-    bool const            m_bIsWeb;
+    bool            m_bIsWeb;
 
     const css::uno::Sequence<OUString>& GetPropertyNames() const;
 
diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx
index 7ca5397e3e81..d9d32a80f11e 100644
--- a/sw/inc/modeltoviewhelper.hxx
+++ b/sw/inc/modeltoviewhelper.hxx
@@ -95,9 +95,9 @@ class ModelToViewHelper
             , m_bVisible(bVisible)
         {
         }
-        sal_Int32 const m_nModelPos;
-        sal_Int32 const m_nViewPos;
-        bool const m_bVisible;
+        sal_Int32 m_nModelPos;
+        sal_Int32 m_nViewPos;
+        bool m_bVisible;
     };
     typedef std::vector< ConversionMapEntry > ConversionMap;
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 36ce909cb7cf..36d6e945d16e 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -81,7 +81,7 @@ class SW_DLLPUBLIC SwNode
 {
     friend class SwNodes;
 
-    SwNodeType const m_nNodeType;
+    SwNodeType m_nNodeType;
 
     /// For text nodes: level of auto format. Was put here because we had still free bits.
     sal_uInt8 m_nAFormatNumLvl : 3;
@@ -100,7 +100,7 @@ private:
 
 #ifdef DBG_UTIL
     static long s_nSerial;
-    long const m_nSerial;
+    long m_nSerial;
 #endif
 
     /// all SwFrameFormat that are anchored at the node
@@ -307,7 +307,7 @@ class SAL_DLLPUBLIC_RTTI SwStartNode: public SwNode
     friend class SwEndNode;     ///< to set the theEndOfSection !!
 
     SwEndNode* m_pEndOfSection;
-    SwStartNodeType const m_eStartNodeType;
+    SwStartNodeType m_eStartNodeType;
 
     /// for the initial StartNode
     SwStartNode( SwNodes& rNodes, sal_uLong nPos );
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 8d8c77d1c6e0..c5044e19a74e 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -357,7 +357,7 @@ class SwPageDescExt
 public:
     SwPageDesc m_PageDesc;
 private:
-    SwDoc * const m_pDoc;
+    SwDoc * m_pDoc;
     OUString m_sFollow;
 
     void SetPageDesc(const SwPageDesc & rPageDesc);
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index 40eb643889d2..41a2835ebe51 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.hxx
@@ -25,7 +25,7 @@
 class SwPrintOptions final : public SwPrintData, public utl::ConfigItem
 {
 private:
-    bool const            m_bIsWeb;
+    bool            m_bIsWeb;
 
     css::uno::Sequence<OUString> GetPropertyNames() const;
 
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 5bbccc87dc93..e75ad1aaa28d 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -94,7 +94,7 @@ class SW_DLLPUBLIC SwRedlineData
     DateTime m_aStamp;
     RedlineType m_eType;
     bool m_bAutoFormat;
-    std::size_t const m_nAuthor;
+    std::size_t m_nAuthor;
     sal_uInt16 m_nSeqNo;
 
 public:
@@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwRangeRedline : public SwPaM
     SwNodeIndex* m_pContentSect;
     bool m_bDelLastPara : 1;
     bool m_bIsVisible : 1;
-    sal_uInt32 const m_nId;
+    sal_uInt32 m_nId;
 
     std::optional<long> m_oLOKLastNodeTop;
 
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index a55e38eebcc3..080fb97071c7 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -150,12 +150,12 @@ public:
 class SW_DLLPUBLIC SwReader: public SwDocFac
 {
     SvStream* mpStrm;
-    tools::SvRef<SotStorage> const mpStg;
+    tools::SvRef<SotStorage> mpStg;
     css::uno::Reference < css::embed::XStorage > mxStg;
-    SfxMedium* const mpMedium;     // Who wants to obtain a Medium (W4W).
+    SfxMedium* mpMedium;     // Who wants to obtain a Medium (W4W).
 
-    SwPaM* const mpCursor;
-    OUString const maFileName;
+    SwPaM* mpCursor;
+    OUString maFileName;
     OUString msBaseURL;
     bool mbSkipImages;
 
@@ -508,7 +508,7 @@ class SW_DLLPUBLIC SwWriter
     css::uno::Reference < css::embed::XStorage > m_xStg;
     SfxMedium* m_pMedium;
 
-    SwPaM* const m_pOutPam;
+    SwPaM* m_pOutPam;
     SwCursorShell *m_pShell;
     SwDoc &m_rDoc;
 
@@ -535,9 +535,9 @@ ErrCode GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS );
 struct SwReaderWriterEntry
 {
     Reader* pReader;
-    FnGetReader const fnGetReader;
-    FnGetWriter const fnGetWriter;
-    bool const bDelReader;
+    FnGetReader fnGetReader;
+    FnGetWriter fnGetWriter;
+    bool bDelReader;
 
     SwReaderWriterEntry( const FnGetReader fnReader, const FnGetWriter fnWriter, bool bDel )
         : pReader( nullptr ), fnGetReader( fnReader ), fnGetWriter( fnWriter ), bDelReader( bDel )
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 85b18b0c2478..ef81f1a64eaa 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -26,37 +26,37 @@
 
 struct SW_DLLPUBLIC ShellResource
 {
-    OUString const        aPostItAuthor;
-    OUString const        aPostItPage;
-    OUString const        aPostItLine;
+    OUString        aPostItAuthor;
+    OUString        aPostItPage;
+    OUString        aPostItLine;
 
     // Calc error-strings.
-    OUString const        aCalc_Syntax;
-    OUString const        aCalc_ZeroDiv;
-    OUString const        aCalc_Brack;
-    OUString const        aCalc_Pow;
-    OUString const        aCalc_Overflow;
-    OUString const        aCalc_Default;
-    OUString const        aCalc_Error;
+    OUString        aCalc_Syntax;
+    OUString        aCalc_ZeroDiv;
+    OUString        aCalc_Brack;
+    OUString        aCalc_Pow;
+    OUString        aCalc_Overflow;
+    OUString        aCalc_Default;
+    OUString        aCalc_Error;
 
     // For GetRefField - referenced item not found.
-    OUString const        aGetRefField_RefItemNotFound;
+    OUString        aGetRefField_RefItemNotFound;
     // For some list boxes - string "none"
-    OUString const        aStrNone;
+    OUString        aStrNone;
     // For fixed fields.
-    OUString const        aFixedStr;
+    OUString        aFixedStr;
     // Custom fields of type css::util::Duration.
-    OUString const        sDurationFormat;
+    OUString        sDurationFormat;
 
     //Names of TOXs.
-    OUString const        aTOXIndexName;
-    OUString const        aTOXUserName;
-    OUString const        aTOXContentName;
-    OUString const        aTOXIllustrationsName;
-    OUString const        aTOXObjectsName;
-    OUString const        aTOXTablesName;
-    OUString const        aTOXAuthoritiesName;
-    OUString const        aTOXCitationName;
+    OUString        aTOXIndexName;
+    OUString        aTOXUserName;
+    OUString        aTOXContentName;
+    OUString        aTOXIllustrationsName;
+    OUString        aTOXObjectsName;
+    OUString        aTOXTablesName;
+    OUString        aTOXAuthoritiesName;
+    OUString        aTOXCitationName;
 
     std::vector<OUString> aDocInfoLst;
 
@@ -79,9 +79,9 @@ struct SW_DLLPUBLIC ShellResource
 private:
     void GetAutoFormatNameLst_() const;
     mutable std::unique_ptr<std::vector<OUString>> pAutoFormatNameLst;
-    OUString const        sPageDescFirstName;
-    OUString const        sPageDescFollowName;
-    OUString const        sPageDescName;
+    OUString        sPageDescFirstName;
+    OUString        sPageDescFollowName;
+    OUString        sPageDescName;
 };
 
 inline const std::vector<OUString>& ShellResource::GetAutoFormatNameLst() const
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 2475470bf056..ee502b5e220c 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -62,8 +62,8 @@ struct SwArgsBase     // used for text conversion (Hangul/Hanja, ...)
 struct SwConversionArgs : SwArgsBase
 {
     OUString   aConvText;          // convertible text found
-    LanguageType const nConvSrcLang;       // (source) language to look for
-    LanguageType       nConvTextLang;      // language of aConvText (if the latter one was found)
+    LanguageType    nConvSrcLang;       // (source) language to look for
+    LanguageType    nConvTextLang;      // language of aConvText (if the latter one was found)
 
     // used for chinese translation
     LanguageType    nConvTargetLang;    // target language of text to be changed
@@ -89,7 +89,7 @@ struct SwSpellArgs : SwArgsBase
 
     css::uno::Reference< css::linguistic2::XSpellAlternatives > xSpellAlt;
 
-    bool const bIsGrammarCheck;
+    bool bIsGrammarCheck;
 
     SwSpellArgs(css::uno::Reference<
             css::linguistic2::XSpellChecker1 > const &rxSplChk,
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 616ae10fd646..0fc402360e2d 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -145,7 +145,7 @@ private:
     friend void InitCore();            // For creating/deleting of version maps.
     friend void FinitCore();
 
-    SwDoc* const m_pDoc;
+    SwDoc* m_pDoc;
 
 public:
     SwAttrPool( SwDoc* pDoc );
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index e2577735b9af..0a6b65a33897 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.hxx
@@ -30,7 +30,7 @@ class EmbeddedObjectRef;
 class SwOleClient final : public SfxInPlaceClient
 {
     bool m_IsInDoVerb;
-    bool const m_IsOldCheckForOLEInCaption;
+    bool m_IsOldCheckForOLEInCaption;
 
     virtual void ObjectAreaChanged() override;
     virtual void RequestNewObjectArea( tools::Rectangle& ) override;
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index 05115ed10b27..de273d679b8b 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -31,7 +31,7 @@ class SwTextNode;
 // during spell check
 class SwScanner
 {
-    std::function<LanguageType (sal_Int32, sal_Int32, bool)> const m_pGetLangOfChar;
+    std::function<LanguageType (sal_Int32, sal_Int32, bool)> m_pGetLangOfChar;
     OUString m_aWord;
     const OUString m_aPreDashReplacementText;
     OUString m_aText;
@@ -43,8 +43,8 @@ class SwScanner
     sal_Int32 m_nLength;
     sal_Int32 m_nOverriddenDashCount;
     LanguageType m_aCurrentLang;
-    sal_uInt16 const m_nWordType;
-    bool const m_bClip;
+    sal_uInt16 m_nWordType;
+    bool m_bClip;
 
 public:
     SwScanner(const std::function<LanguageType(sal_Int32, sal_Int32, bool)>& pGetLangOfChar,
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 0639db32f72e..e7ef81b53ef3 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -121,7 +121,7 @@ bool CheckSplitCells( const SwCursor& rCursor, sal_uInt16 nDiv,
 class SwSelUnion
 {
     SwRect   m_aUnion;        // The rectangle enclosing the selection.
-    SwTabFrame * const m_pTable;  // The (Follow-)Table for the Union.
+    SwTabFrame *m_pTable;       // The (Follow-)Table for the Union.
 
 public:
     SwSelUnion( const SwRect &rRect, SwTabFrame *pTab ) :
@@ -156,9 +156,9 @@ typedef std::vector<std::unique_ptr<FndLine_>> FndLines_t;
 
 class FndBox_
 {
-    SwTableBox* const m_pBox;
+    SwTableBox* m_pBox;
     FndLines_t m_Lines;
-    FndLine_* const m_pUpper;
+    FndLine_* m_pUpper;
 
     SwTableLine *m_pLineBefore;   // For deleting/restoring the layout.
     SwTableLine *m_pLineBehind;
@@ -191,7 +191,7 @@ public:
 
 class FndLine_
 {
-    SwTableLine* const m_pLine;
+    SwTableLine* m_pLine;
     FndBoxes_t m_Boxes;
     FndBox_* m_pUpper;
 
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index b6cfb3298360..eed9e670aeae 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -158,8 +158,8 @@ public:
     inline TOXTypes         GetType() const;
 
 private:
-    OUString const        m_aName;
-    TOXTypes const        m_eType;
+    OUString        m_aName;
+    TOXTypes        m_eType;
 
     // @@@ public copy ctor, but no copy assignment?
     SwTOXType & operator= (const SwTOXType &) = delete;
@@ -236,7 +236,7 @@ struct SW_DLLPUBLIC SwFormToken
 
 struct SwFormTokenEqualToFormTokenType
 {
-    FormTokenType const eType;
+    FormTokenType eType;
 
     SwFormTokenEqualToFormTokenType(FormTokenType _eType) : eType(_eType) {}
     bool operator()(const SwFormToken & rToken)
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index 8cf7eca01452..76a865cab9ff 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -33,7 +33,7 @@ class SwScriptIterator
     const OUString& m_rText;
     sal_Int32 m_nChgPos;
     sal_uInt16 m_nCurScript;
-    bool const m_bForward;
+    bool m_bForward;
 
 public:
     SwScriptIterator( const OUString& rStr, sal_Int32 nStart,
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 80f90e302db6..8da9b70980b8 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -53,7 +53,7 @@ class SwUndo
 {
     SwUndoId const m_nId;
     RedlineFlags   m_nOrigRedlineFlags;
-    ViewShellId const    m_nViewShellId;
+    ViewShellId    m_nViewShellId;
     bool m_isRepeatIgnored; ///< for multi-selection, only repeat 1st selection
 
 protected:
@@ -309,7 +309,7 @@ public:
 class SwUndoInsLayFormat : public SwUndoFlyBase
 {
     sal_uLong mnCursorSaveIndexPara;           // Cursor position
-    sal_Int32 const mnCursorSaveIndexPos;            // for undo
+    sal_Int32 mnCursorSaveIndexPos;            // for undo
 public:
     SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx );
 
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 196e3f32dd3a..b085aaaaf1b2 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -236,8 +236,8 @@ class SwChartDataSequence final :
     ::comphelper::OInterfaceContainerHelper2          m_aModifyListeners;
     css::chart2::data::DataSequenceRole               m_aRole;
 
-    OUString const  m_aRowLabelText;
-    OUString const  m_aColLabelText;
+    OUString  m_aRowLabelText;
+    OUString  m_aColLabelText;
 
     rtl::Reference<SwChartDataProvider>                m_xDataProvider;
 
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index f8b9f4265d6d..dc36615d7d4b 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -151,7 +151,7 @@ private:
     SwDocShell*                 m_pDocShell; // Only if used as chapter numbering.
     SwNumRule*                  m_pNumRule;
     const SfxItemPropertySet*   m_pPropertySet;
-    bool const                  m_bOwnNumRuleCreated;
+    bool                        m_bOwnNumRuleCreated;
 protected:
     virtual ~SwXNumberingRules() override;
 
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 058812c17923..4e8fee328724 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -106,7 +106,7 @@ class SwXAutoStyles final :
     public cppu::WeakImplHelper< css::style::XAutoStyles >,
     public SwUnoCollection
 {
-    SwDocShell * const m_pDocShell;
+    SwDocShell *m_pDocShell;
     css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoCharStyles;
     css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoRubyStyles;
     css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoParaStyles;
@@ -134,7 +134,7 @@ public:
 class SwXAutoStyleFamily final : public cppu::WeakImplHelper< css::style::XAutoStyleFamily >, public SvtListener
 {
     SwDocShell *m_pDocShell;
-    IStyleAccess::SwAutoStyleFamily const m_eFamily;
+    IStyleAccess::SwAutoStyleFamily m_eFamily;
 
 
 public:
@@ -178,9 +178,9 @@ class SwXAutoStyle final : public cppu::WeakImplHelper
     public SvtListener
 {
 private:
-    std::shared_ptr<SfxItemSet>            mpSet;
-    IStyleAccess::SwAutoStyleFamily const  meFamily;
-    SwDoc&                                 mrDoc;
+    std::shared_ptr<SfxItemSet>         mpSet;
+    IStyleAccess::SwAutoStyleFamily     meFamily;
+    SwDoc&                              mrDoc;
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 4952c6fc9dd6..59b859504ae1 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -555,7 +555,7 @@ class SwXOutlineTarget final : public cppu::WeakImplHelper
 >
 {
     const SfxItemPropertySet*   pPropSet;
-    OUString const              sOutlineText;
+    OUString                    sOutlineText;
 
 public:
     SwXOutlineTarget(const OUString& rOutlineText);
@@ -607,8 +607,8 @@ public:
 // After printing the view options are restored
 class SwViewOptionAdjust_Impl
 {
-    SwViewShell *      m_pShell;
-    SwViewOption const m_aOldViewOptions;
+    SwViewShell *   m_pShell;
+    SwViewOption    m_aOldViewOptions;
 public:
     SwViewOptionAdjust_Impl( SwViewShell& rSh, const SwViewOption &rViewOptions );
     ~SwViewOptionAdjust_Impl();