Revert "loplugin:constfields in sc"

This reverts commit fb1d3b580763a333bbbfe115d09e1b5cd8849675.

Now that we know that making fields has negative side effects
like disabling assignment operator generation.

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

25 files changed, 155 insertions, 155 deletions

diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index efa1ac103e1e..c3a92bf7d187 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -57,10 +57,10 @@ namespace {
 
 struct ScSlotData
 {
-    SCROW const  nStartRow;   // first row of this segment
-    SCROW const  nStopRow;    // first row of next segment
-    SCSIZE const nSlice;      // slice size in this segment
-    SCSIZE const nCumulated;  // cumulated slots of previous segments
+    SCROW  nStartRow;   // first row of this segment
+    SCROW  nStopRow;    // first row of next segment
+    SCSIZE nSlice;      // slice size in this segment
+    SCSIZE nCumulated;  // cumulated slots of previous segments
 
     ScSlotData( SCROW r1, SCROW r2, SCSIZE s, SCSIZE c ) : nStartRow(r1), nStopRow(r2), nSlice(s), nCumulated(c) {}
 };
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 2fc667a17b74..693da4ae62f2 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1322,7 +1322,7 @@ const OUStringLiteral a5Ratings[] = {
 };
 
 struct ScIconSetBitmapMap {
-    ScIconSetType const eType;
+    ScIconSetType eType;
     const OUStringLiteral* pBitmaps;
 };
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 36432e9f3358..7fa1c4c30286 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1258,7 +1258,7 @@ class CopyAsLinkHandler
     ScColumn& mrDestCol;
     sc::ColumnBlockPosition maDestPos;
     sc::ColumnBlockPosition* mpDestPos;
-    InsertDeleteFlags const mnCopyFlags;
+    InsertDeleteFlags mnCopyFlags;
 
     sc::StartListeningType meListenType;
 
@@ -1394,10 +1394,10 @@ class CopyByCloneHandler
     sc::ColumnBlockPosition maDestPos;
     sc::ColumnBlockPosition* mpDestPos;
     svl::SharedStringPool* mpSharedStringPool;
-    InsertDeleteFlags const mnCopyFlags;
+    InsertDeleteFlags mnCopyFlags;
 
     sc::StartListeningType meListenType;
-    ScCloneFlags const mnFormulaCellCloneFlags;
+    ScCloneFlags mnFormulaCellCloneFlags;
 
     void setDefaultAttrToDest(size_t nRow)
     {
@@ -1890,8 +1890,8 @@ void resetColumnPosition(sc::CellStoreType& rCells, SCCOL nCol)
 
 class NoteCaptionUpdater
 {
-    SCCOL const mnCol;
-    SCTAB const mnTab;
+    SCCOL mnCol;
+    SCTAB mnTab;
 public:
     NoteCaptionUpdater( SCCOL nCol, SCTAB nTab ) : mnCol(nCol), mnTab(nTab) {}
 
@@ -2092,7 +2092,7 @@ public:
 class UpdateRefOnCopy
 {
     const sc::RefUpdateContext& mrCxt;
-    ScDocument* const mpUndoDoc;
+    ScDocument* mpUndoDoc;
     bool mbUpdated;
 
 public:
@@ -2538,9 +2538,9 @@ class UpdateTransHandler
 {
     ScColumn& mrColumn;
     sc::CellStoreType::iterator miPos;
-    ScRange const maSource;
-    ScAddress const maDest;
-    ScDocument* const mpUndoDoc;
+    ScRange maSource;
+    ScAddress maDest;
+    ScDocument* mpUndoDoc;
 public:
     UpdateTransHandler(ScColumn& rColumn, const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc) :
         mrColumn(rColumn),
@@ -2561,9 +2561,9 @@ class UpdateGrowHandler
 {
     ScColumn& mrColumn;
     sc::CellStoreType::iterator miPos;
-    ScRange const maArea;
-    SCCOL const mnGrowX;
-    SCROW const mnGrowY;
+    ScRange maArea;
+    SCCOL mnGrowX;
+    SCROW mnGrowY;
 public:
     UpdateGrowHandler(ScColumn& rColumn, const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY) :
         mrColumn(rColumn),
@@ -2585,7 +2585,7 @@ class InsertTabUpdater
     sc::RefUpdateInsertTabContext& mrCxt;
     sc::CellTextAttrStoreType& mrTextAttrs;
     sc::CellTextAttrStoreType::iterator miAttrPos;
-    SCTAB const mnTab;
+    SCTAB mnTab;
     bool mbModified;
 
 public:
@@ -2618,7 +2618,7 @@ class DeleteTabUpdater
     sc::RefUpdateDeleteTabContext& mrCxt;
     sc::CellTextAttrStoreType& mrTextAttrs;
     sc::CellTextAttrStoreType::iterator miAttrPos;
-    SCTAB const mnTab;
+    SCTAB mnTab;
     bool mbModified;
 public:
     DeleteTabUpdater(sc::RefUpdateDeleteTabContext& rCxt, sc::CellTextAttrStoreType& rTextAttrs, SCTAB nTab) :
@@ -2649,8 +2649,8 @@ class InsertAbsTabUpdater
 {
     sc::CellTextAttrStoreType& mrTextAttrs;
     sc::CellTextAttrStoreType::iterator miAttrPos;
-    SCTAB const mnTab;
-    SCTAB const mnNewPos;
+    SCTAB mnTab;
+    SCTAB mnNewPos;
     bool mbModified;
 public:
     InsertAbsTabUpdater(sc::CellTextAttrStoreType& rTextAttrs, SCTAB nTab, SCTAB nNewPos) :
@@ -2682,7 +2682,7 @@ class MoveTabUpdater
     sc::RefUpdateMoveTabContext& mrCxt;
     sc::CellTextAttrStoreType& mrTextAttrs;
     sc::CellTextAttrStoreType::iterator miAttrPos;
-    SCTAB const mnTab;
+    SCTAB mnTab;
     bool mbModified;
 public:
     MoveTabUpdater(sc::RefUpdateMoveTabContext& rCxt, sc::CellTextAttrStoreType& rTextAttrs, SCTAB nTab) :
@@ -2711,7 +2711,7 @@ public:
 
 class UpdateCompileHandler
 {
-    bool const mbForceIfNameInUse:1;
+    bool mbForceIfNameInUse:1;
 public:
     explicit UpdateCompileHandler(bool bForceIfNameInUse) :
         mbForceIfNameInUse(bForceIfNameInUse) {}
@@ -2724,7 +2724,7 @@ public:
 
 class TabNoSetter
 {
-    SCTAB const mnTab;
+    SCTAB mnTab;
 public:
     explicit TabNoSetter(SCTAB nTab) : mnTab(nTab) {}
 
@@ -2985,7 +2985,7 @@ class CompileErrorCellsHandler
     sc::CompileFormulaContext& mrCxt;
     ScColumn& mrColumn;
     sc::CellStoreType::iterator miPos;
-    FormulaError const mnErrCode;
+    FormulaError mnErrCode;
     bool mbCompiled;
 public:
     CompileErrorCellsHandler( sc::CompileFormulaContext& rCxt, ScColumn& rColumn, FormulaError nErrCode ) :
@@ -3025,7 +3025,7 @@ public:
 class CalcAfterLoadHandler
 {
     sc::CompileFormulaContext& mrCxt;
-    bool const mbStartListening;
+    bool mbStartListening;
 
 public:
     CalcAfterLoadHandler( sc::CompileFormulaContext& rCxt, bool bStartListening ) :
@@ -3052,7 +3052,7 @@ class FindEditCellsHandler
 {
     ScColumn& mrColumn;
     sc::CellTextAttrStoreType::iterator miAttrPos;
-    sc::CellStoreType::iterator const miCellPos;
+    sc::CellStoreType::iterator miCellPos;
 
 public:
     explicit FindEditCellsHandler(ScColumn& rCol) :
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index f00da7667514..6d19daf40fa5 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -575,7 +575,7 @@ namespace {
 class MaxStrLenFinder
 {
     ScDocument& mrDoc;
-    sal_uInt32 const mnFormat;
+    sal_uInt32 mnFormat;
     OUString maMaxLenStr;
     sal_Int32 mnMaxLen;
 
@@ -1034,8 +1034,8 @@ class StrEntries
 protected:
     struct StrEntry
     {
-        SCROW const mnRow;
-        OUString const maStr;
+        SCROW mnRow;
+        OUString maStr;
 
         StrEntry(SCROW nRow, const OUString& rStr) : mnRow(nRow), maStr(rStr) {}
     };
@@ -1118,7 +1118,7 @@ public:
 
 class TestTabRefAbsHandler
 {
-    SCTAB const mnTab;
+    SCTAB mnTab;
     bool mbTestResult;
 public:
     explicit TestTabRefAbsHandler(SCTAB nTab) : mnTab(nTab), mbTestResult(false) {}
@@ -1797,12 +1797,12 @@ class CopyCellNotesHandler
     ScColumn& mrDestCol;
     sc::CellNoteStoreType& mrDestNotes;
     sc::CellNoteStoreType::iterator miPos;
-    SCTAB const mnSrcTab;
-    SCCOL const mnSrcCol;
-    SCTAB const mnDestTab;
-    SCCOL const mnDestCol;
-    SCROW const mnDestOffset; /// Add this to the source row position to get the destination row.
-    bool const mbCloneCaption;
+    SCTAB mnSrcTab;
+    SCCOL mnSrcCol;
+    SCTAB mnDestTab;
+    SCCOL mnDestCol;
+    SCROW mnDestOffset; /// Add this to the source row position to get the destination row.
+    bool mbCloneCaption;
 
 public:
     CopyCellNotesHandler( const ScColumn& rSrcCol, ScColumn& rDestCol, SCROW nDestOffset, bool bCloneCaption ) :
@@ -2160,9 +2160,9 @@ namespace {
 class ToMatrixHandler
 {
     ScMatrix& mrMat;
-    SCCOL const mnMatCol;
-    SCROW const mnTopRow;
-    ScDocument* const mpDoc;
+    SCCOL mnMatCol;
+    SCROW mnTopRow;
+    ScDocument* mpDoc;
     svl::SharedStringPool& mrStrPool;
 public:
     ToMatrixHandler(ScMatrix& rMat, SCCOL nMatCol, SCROW nTopRow, ScDocument* pDoc) :
@@ -2253,10 +2253,10 @@ struct CellBucket
 class FillMatrixHandler
 {
     ScMatrix& mrMat;
-    size_t const mnMatCol;
-    size_t const mnTopRow;
+    size_t mnMatCol;
+    size_t mnTopRow;
 
-    ScDocument* const mpDoc;
+    ScDocument* mpDoc;
     svl::SharedStringPool& mrPool;
     svl::SharedStringPool* mpPool; // if matrix is not in the same document
 
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 29eb7d51a90f..2f3869db93c0 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -373,7 +373,7 @@ public:
 
 class DetachFormulaCellsHandler
 {
-    ScDocument* const mpDoc;
+    ScDocument* mpDoc;
     sc::EndListeningContext* mpCxt;
 
 public:
@@ -799,10 +799,10 @@ class DeleteAreaHandler
     std::vector<ScFormulaCell*> maFormulaCells;
     sc::SingleColumnSpanSet maDeleteRanges;
 
-    bool const mbNumeric:1;
-    bool const mbString:1;
-    bool const mbFormula:1;
-    bool const mbDateTime:1;
+    bool mbNumeric:1;
+    bool mbString:1;
+    bool mbFormula:1;
+    bool mbDateTime:1;
     ScColumn& mrCol;
 
 public:
@@ -1053,7 +1053,7 @@ class CopyAttrArrayByRange
 {
     ScAttrArray& mrDestAttrArray;
     ScAttrArray& mrSrcAttrArray;
-    long const mnRowOffset;
+    long mnRowOffset;
 public:
     CopyAttrArrayByRange(ScAttrArray& rDestAttrArray, ScAttrArray& rSrcAttrArray, long nRowOffset) :
         mrDestAttrArray(rDestAttrArray), mrSrcAttrArray(rSrcAttrArray), mnRowOffset(nRowOffset) {}
@@ -1070,11 +1070,11 @@ class CopyCellsFromClipHandler
     sc::CopyFromClipContext& mrCxt;
     ScColumn& mrSrcCol;
     ScColumn& mrDestCol;
-    SCTAB const mnTab;
-    SCCOL const mnCol;
-    SCTAB const mnSrcTab;
-    SCCOL const mnSrcCol;
-    long const mnRowOffset;
+    SCTAB mnTab;
+    SCCOL mnCol;
+    SCTAB mnSrcTab;
+    SCCOL mnSrcCol;
+    long mnRowOffset;
     sc::ColumnBlockPosition maDestBlockPos;
     sc::ColumnBlockPosition* mpDestBlockPos; // to save it for next iteration.
     svl::SharedStringPool* mpSharedStringPool;
@@ -1335,7 +1335,7 @@ public:
 class CopyTextAttrsFromClipHandler
 {
     sc::CellTextAttrStoreType& mrAttrs;
-    size_t const mnDelta;
+    size_t mnDelta;
     sc::ColumnBlockPosition maDestBlockPos;
     sc::ColumnBlockPosition* mpDestBlockPos; // to save it for next iteration.
 
@@ -1519,10 +1519,10 @@ class MixDataHandler
     sc::CellStoreType maNewCells;
     sc::CellStoreType::iterator miNewCellsPos;
 
-    size_t const mnRowOffset;
-    ScPasteFunc const mnFunction;
+    size_t mnRowOffset;
+    ScPasteFunc mnFunction;
 
-    bool const mbSkipEmpty;
+    bool mbSkipEmpty;
 
     void doFunction( size_t nDestRow, double fVal1, double fVal2 )
     {
@@ -1896,7 +1896,7 @@ namespace {
 class StartListenersHandler
 {
     sc::StartListeningContext* mpCxt;
-    bool const mbAllListeners;
+    bool mbAllListeners;
 
 public:
     StartListenersHandler( sc::StartListeningContext& rCxt, bool bAllListeners ) :
@@ -2531,8 +2531,8 @@ class StrCellIterator
 {
     typedef std::pair<sc::CellStoreType::const_iterator,size_t> PosType;
     PosType maPos;
-    sc::CellStoreType::const_iterator const miBeg;
-    sc::CellStoreType::const_iterator const miEnd;
+    sc::CellStoreType::const_iterator miBeg;
+    sc::CellStoreType::const_iterator miEnd;
     const ScDocument* mpDoc;
 public:
     StrCellIterator(const sc::CellStoreType& rCells, SCROW nStart, const ScDocument* pDoc) :
@@ -3129,8 +3129,8 @@ class MaxStringLenHandler
     sal_Int32 mnMaxLen;
     const ScColumn& mrColumn;
     SvNumberFormatter* mpFormatter;
-    rtl_TextEncoding const meCharSet;
-    bool const mbOctetEncoding;
+    rtl_TextEncoding meCharSet;
+    bool mbOctetEncoding;
 
     void processCell(size_t nRow, const ScRefCellValue& rCell)
     {
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index fed5e01c3e3a..1b23ff713ce5 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -650,7 +650,7 @@ public:
 
 class NoteCaptionCleaner
 {
-    bool const mbPreserveData;
+    bool mbPreserveData;
 public:
     explicit NoteCaptionCleaner( bool bPreserveData ) : mbPreserveData(bPreserveData) {}
 
@@ -710,10 +710,10 @@ namespace {
 class NoteEntryCollector
 {
     std::vector<sc::NoteEntry>& mrNotes;
-    SCTAB const mnTab;
-    SCCOL const mnCol;
-    SCROW const mnStartRow;
-    SCROW const mnEndRow;
+    SCTAB mnTab;
+    SCCOL mnCol;
+    SCROW mnStartRow;
+    SCROW mnEndRow;
 public:
     NoteEntryCollector( std::vector<sc::NoteEntry>& rNotes, SCTAB nTab, SCCOL nCol,
             SCROW nStartRow, SCROW nEndRow) :
@@ -982,7 +982,7 @@ class ScriptTypeUpdater
     ScColumn& mrCol;
     sc::CellTextAttrStoreType& mrTextAttrs;
     sc::CellTextAttrStoreType::iterator miPosAttr;
-    ScConditionalFormatList* const mpCFList;
+    ScConditionalFormatList* mpCFList;
     SvNumberFormatter* mpFormatter;
     ScAddress maPos;
     bool mbUpdated;
@@ -1125,8 +1125,8 @@ namespace {
 
 class FormulaColPosSetter
 {
-    SCCOL const mnCol;
-    bool const  mbUpdateRefs;
+    SCCOL mnCol;
+    bool  mbUpdateRefs;
 public:
     FormulaColPosSetter( SCCOL nCol, bool bUpdateRefs ) : mnCol(nCol), mbUpdateRefs(bUpdateRefs) {}
 
@@ -1165,7 +1165,7 @@ namespace {
 class RelativeRefBoundChecker
 {
     std::vector<SCROW> maBounds;
-    ScRange const maBoundRange;
+    ScRange maBoundRange;
 
 public:
     explicit RelativeRefBoundChecker( const ScRange& rBoundRange ) :
diff --git a/sc/source/core/data/columnspanset.cxx b/sc/source/core/data/columnspanset.cxx
index 8bdd64a55064..e8c4baf31887 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -28,7 +28,7 @@ namespace {
 class ColumnScanner
 {
     ColumnSpanSet::ColumnSpansType& mrRanges;
-    bool const mbVal;
+    bool mbVal;
 public:
     ColumnScanner(ColumnSpanSet::ColumnSpansType& rRanges, bool bVal) :
         mrRanges(rRanges), mbVal(bVal) {}
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index bdbf1f2be63c..604cbbf361b0 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1272,7 +1272,7 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
     struct BoolResetter
     {
         bool& mr;
-        bool const  mb;
+        bool  mb;
         BoolResetter( bool& r, bool b ) : mr(r), mb(r) { r = b; }
         ~BoolResetter() { mr = mb; }
     } aRangeLookupResetter( maParam.mbRangeLookup, true);
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 907cb9a8a7cc..14929e65ff19 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -474,8 +474,8 @@ class IdleCalcTextWidthScope : public TaskStopwatch
     ScAddress& mrCalcPos;
     MapMode maOldMapMode;
     ScStyleSheetPool* mpStylePool;
-    SfxStyleSearchBits const mnOldSearchMask;
-    SfxStyleFamily const meOldFamily;
+    SfxStyleSearchBits mnOldSearchMask;
+    SfxStyleFamily meOldFamily;
     bool mbNeedMore;
     bool mbProgress;
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 6ff14d683189..4ecd59225f45 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1238,8 +1238,8 @@ struct BroadcastRecalcOnRefMoveGuard
     }
 
 private:
-    sc::AutoCalcSwitch const aSwitch; // first for ctor/dtor order, destroy second
-    ScBulkBroadcast const aBulk;      // second for ctor/dtor order, destroy first
+    sc::AutoCalcSwitch aSwitch; // first for ctor/dtor order, destroy second
+    ScBulkBroadcast aBulk;      // second for ctor/dtor order, destroy first
 };
 
 }
diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index 3b67bb6c3af1..b04ac76e06ab 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -656,8 +656,8 @@ ScRangeData* copyRangeName( const ScRangeData* pOldRangeData, ScDocument& rNewDo
 
 struct SheetIndex
 {
-    SCTAB const       mnSheet;
-    sal_uInt16 const  mnIndex;
+    SCTAB       mnSheet;
+    sal_uInt16  mnIndex;
 
     SheetIndex( SCTAB nSheet, sal_uInt16 nIndex ) : mnSheet(nSheet < -1 ? -1 : nSheet), mnIndex(nIndex) {}
     bool operator<( const SheetIndex& r ) const
diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx
index 83429a587a9e..41f84bd26a08 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -632,7 +632,7 @@ class CellStoreInitializer
     {
         sc::CellTextAttrStoreType maAttrs;
         sc::CellTextAttrStoreType::iterator miPos;
-        SvtScriptType const mnScriptNumeric;
+        SvtScriptType mnScriptNumeric;
 
         explicit Impl(const SvtScriptType nScriptNumeric)
             : maAttrs(MAXROWCOUNT), miPos(maAttrs.begin()), mnScriptNumeric(nScriptNumeric)
@@ -640,8 +640,8 @@ class CellStoreInitializer
     };
 
     ScDocumentImportImpl& mrDocImpl;
-    SCTAB const mnTab;
-    SCCOL const mnCol;
+    SCTAB mnTab;
+    SCCOL mnCol;
 
 public:
     CellStoreInitializer( ScDocumentImportImpl& rDocImpl, SCTAB nTab, SCCOL nCol ) :
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 994b2d7bd0fb..a4a22ff61e91 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -538,14 +538,14 @@ namespace {
 
 struct ScDPSaveGroupDimNameFunc
 {
-    OUString const       maDimName;
+    OUString       maDimName;
     explicit     ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {}
     bool         operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; }
 };
 
 struct ScDPSaveGroupSourceNameFunc
 {
-    OUString const       maSrcDimName;
+    OUString       maSrcDimName;
     explicit     ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {}
     bool         operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; }
 };
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 456de9baa3d0..93601ebf68a7 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -53,8 +53,8 @@ public:
     virtual bool match(const ScDPItemData &rCellData) const override;
     virtual std::vector<ScDPItemData> getMatchValues() const override;
 private:
-    std::vector<ScDPItemData> const maValues;
-    ScDPNumGroupInfo const maNumInfo;
+    std::vector<ScDPItemData> maValues;
+    ScDPNumGroupInfo maNumInfo;
 };
 
 }
@@ -115,9 +115,9 @@ public:
     virtual std::vector<ScDPItemData> getMatchValues() const override;
 
 private:
-    std::vector<ScDPItemData> const maValues;
-    Date const             maNullDate;
-    ScDPNumGroupInfo const maNumInfo;
+    std::vector<ScDPItemData> maValues;
+    Date             maNullDate;
+    ScDPNumGroupInfo maNumInfo;
 };
 
 }
@@ -624,7 +624,7 @@ namespace {
 
 class FindCaseInsensitive
 {
-    ScDPItemData const maValue;
+    ScDPItemData maValue;
 public:
     explicit FindCaseInsensitive(const ScDPItemData& rVal) : maValue(rVal) {}
 
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 785f7e4eee1f..8c32b58d16e3 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -115,7 +115,7 @@ class DBConnector : public ScDPCache::DBConnector
     uno::Reference<sdbc::XRowSet> mxRowSet;
     uno::Reference<sdbc::XRow> mxRow;
     uno::Reference<sdbc::XResultSetMetaData> mxMetaData;
-    Date const maNullDate;
+    Date maNullDate;
 
 public:
     DBConnector(ScDPCache& rCache, const uno::Reference<sdbc::XRowSet>& xRowSet, const Date& rNullDate);
@@ -559,7 +559,7 @@ namespace {
 class DisableGetPivotData
 {
     ScDPObject& mrDPObj;
-    bool const mbOldState;
+    bool mbOldState;
 public:
     DisableGetPivotData(ScDPObject& rObj, bool bOld) : mrDPObj(rObj), mbOldState(bOld)
     {
@@ -574,7 +574,7 @@ public:
 
 class FindIntersectingTable
 {
-    ScRange const maRange;
+    ScRange maRange;
 public:
     explicit FindIntersectingTable(const ScRange& rRange) : maRange(rRange) {}
 
@@ -586,10 +586,10 @@ public:
 
 class FindIntersectingTableByColumns
 {
-    SCCOL const mnCol1;
-    SCCOL const mnCol2;
-    SCROW const mnRow;
-    SCTAB const mnTab;
+    SCCOL mnCol1;
+    SCCOL mnCol2;
+    SCROW mnRow;
+    SCTAB mnTab;
 public:
     FindIntersectingTableByColumns(SCCOL nCol1, SCCOL nCol2, SCROW nRow, SCTAB nTab) :
         mnCol1(nCol1), mnCol2(nCol2), mnRow(nRow), mnTab(nTab) {}
@@ -620,10 +620,10 @@ public:
 
 class FindIntersectingTableByRows
 {
-    SCCOL const mnCol;
-    SCROW const mnRow1;
-    SCROW const mnRow2;
-    SCTAB const mnTab;
+    SCCOL mnCol;
+    SCROW mnRow1;
+    SCROW mnRow2;
+    SCTAB mnTab;
 public:
     FindIntersectingTableByRows(SCCOL nCol, SCROW nRow1, SCROW nRow2, SCTAB nTab) :
         mnCol(nCol), mnRow1(nRow1), mnRow2(nRow2), mnTab(nTab) {}
@@ -655,7 +655,7 @@ public:
 class AccumulateOutputRanges
 {
     ScRangeList maRanges;
-    SCTAB const mnTab;
+    SCTAB mnTab;
 public:
     explicit AccumulateOutputRanges(SCTAB nTab) : mnTab(nTab) {}
     AccumulateOutputRanges(const AccumulateOutputRanges& r) : maRanges(r.maRanges), mnTab(r.mnTab) {}
@@ -1309,7 +1309,7 @@ namespace {
 
 class FindByName
 {
-    OUString const maName; // must be all uppercase.
+    OUString maName; // must be all uppercase.
 public:
     explicit FindByName(const OUString& rName) : maName(rName) {}
     bool operator() (const ScDPSaveDimension* pDim) const
@@ -1492,7 +1492,7 @@ bool dequote( const OUString& rSource, sal_Int32 nStartPos, sal_Int32& rEndPos,
 struct ScGetPivotDataFunctionEntry
 {
     const char*       pName;
-    sal_Int16 const   eFunc;
+    sal_Int16         eFunc;
 };
 
 bool parseFunction( const OUString& rList, sal_Int32 nStartPos, sal_Int32& rEndPos, sal_Int16& rFunc )
@@ -2137,8 +2137,8 @@ namespace {
 
 class FindByColumn
 {
-    SCCOL const mnCol;
-    PivotFunc const mnMask;
+    SCCOL mnCol;
+    PivotFunc mnMask;
 public:
     FindByColumn(SCCOL nCol, PivotFunc nMask) : mnCol(nCol), mnMask(nMask) {}
     bool operator() (const ScPivotField& r) const
@@ -2591,7 +2591,7 @@ bool hasFieldColumn(const vector<ScPivotField>* pRefFields, SCCOL nCol)
 
 class FindByOriginalDim
 {
-    long const mnDim;
+    long mnDim;
 public:
     explicit FindByOriginalDim(long nDim) : mnDim(nDim) {}
     bool operator() (const ScPivotField& r) const
@@ -3357,7 +3357,7 @@ namespace {
  */
 class MatchByTable
 {
-    SCTAB const mnTab;
+    SCTAB mnTab;
 public:
     explicit MatchByTable(SCTAB nTab) : mnTab(nTab) {}
 
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index e0636a38d136..efda0ab8da23 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -115,20 +115,20 @@ namespace {
 class ScDPOutputImpl
 {
     ScDocument*         mpDoc;
-    sal_uInt16 const          mnTab;
+    sal_uInt16          mnTab;
     ::std::vector< bool > mbNeedLineCols;
     ::std::vector< SCCOL > mnCols;
 
     ::std::vector< bool > mbNeedLineRows;
     ::std::vector< SCROW > mnRows;
 
-    SCCOL const   mnTabStartCol;
-    SCROW const   mnTabStartRow;
+    SCCOL   mnTabStartCol;
+    SCROW   mnTabStartRow;
 
     SCCOL   mnDataStartCol;
     SCROW   mnDataStartRow;
-    SCCOL const   mnTabEndCol;
-    SCROW const   mnTabEndRow;
+    SCCOL   mnTabEndCol;
+    SCROW   mnTabEndRow;
 
 public:
     ScDPOutputImpl( ScDocument* pDoc, sal_uInt16 nTab,
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 6e14356ea7b1..05be6e615bf1 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -135,8 +135,8 @@ public:
 class ScDPRowMembersOrder
 {
     ScDPResultDimension& rDimension;
-    long const           nMeasure;
-    bool const           bAscending;
+    long                 nMeasure;
+    bool                 bAscending;
 
 public:
             ScDPRowMembersOrder( ScDPResultDimension& rDim, long nM, bool bAsc ) :
@@ -151,8 +151,8 @@ public:
 class ScDPColMembersOrder
 {
     ScDPDataDimension& rDimension;
-    long const         nMeasure;
-    bool const         bAscending;
+    long               nMeasure;
+    bool               bAscending;
 
 public:
             ScDPColMembersOrder( ScDPDataDimension& rDim, long nM, bool bAsc ) :
@@ -2685,7 +2685,7 @@ class ScDPGroupCompare
 private:
     const ScDPResultData* pResultData;
     const ScDPInitState& rInitState;
-    long const           nDimSource;
+    long                 nDimSource;
     bool                 bIncludeAll;
     bool                 bIsBase;
     long                 nGroupBase;
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 1e674cc6e972..bd58c00461eb 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -1854,7 +1854,7 @@ namespace {
 class ScDPGlobalMembersOrder
 {
     ScDPLevel&  rLevel;
-    bool const  bAscending;
+    bool        bAscending;
 
 public:
             ScDPGlobalMembersOrder( ScDPLevel& rLev, bool bAsc ) :
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 2f27bffb78ec..704072970ef8 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -120,7 +120,7 @@ namespace {
 class RowInfoFiller
 {
     ScDocument& mrDoc;
-    SCTAB const mnTab;
+    SCTAB mnTab;
     RowInfo* mpRowInfo;
     SCCOL mnArrX;
     SCSIZE mnArrY;
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index e1cb04eb3ad2..d1e4a6970c36 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -313,8 +313,8 @@ lcl_checkRangeDimensions(
 class LessByReference
 {
     const ScDocument* mpDoc;
-    ScAddress const maPos;
-    DimensionSelector const maFunc;
+    ScAddress         maPos;
+    DimensionSelector maFunc;
 public:
     LessByReference(const ScDocument* pDoc, const ScAddress& rPos, const DimensionSelector& rFunc) :
         mpDoc(pDoc), maPos(rPos), maFunc(rFunc) {}
@@ -335,8 +335,8 @@ public:
 class AdjacentByReference
 {
     const ScDocument* mpDoc;
-    ScAddress const maPos;
-    DimensionSelector const maFunc;
+    ScAddress         maPos;
+    DimensionSelector maFunc;
 public:
     AdjacentByReference(const ScDocument* pDoc, const ScAddress& rPos, DimensionSelector aFunc) :
         mpDoc(pDoc), maPos(rPos), maFunc(aFunc) {}
@@ -481,9 +481,9 @@ void adjustDBRange(formula::FormulaToken* pToken, ScDocument& rNewDoc, const ScD
 
 struct AreaListenerKey
 {
-    ScRange const maRange;
-    bool const mbStartFixed;
-    bool const mbEndFixed;
+    ScRange maRange;
+    bool mbStartFixed;
+    bool mbEndFixed;
 
     AreaListenerKey( const ScRange& rRange, bool bStartFixed, bool bEndFixed ) :
         maRange(rRange), mbStartFixed(bStartFixed), mbEndFixed(bEndFixed) {}
@@ -4807,10 +4807,10 @@ bool ScFormulaCell::InterpretFormulaGroupThreading(sc::FormulaLogger::GroupScope
             ScDocument* mpDocument;
             ScInterpreterContext* mpContext;
             const ScAddress& mrTopPos;
-            SCCOL const mnStartCol;
-            SCCOL const mnEndCol;
-            SCROW const mnStartOffset;
-            SCROW const mnEndOffset;
+            SCCOL mnStartCol;
+            SCCOL mnEndCol;
+            SCROW mnStartOffset;
+            SCROW mnEndOffset;
 
         public:
             Executor(const std::shared_ptr<comphelper::ThreadTaskTag>& rTag,
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 6e94059461b9..7c37b12f3d65 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -45,7 +45,7 @@ struct ScFuncDescCore
     /*
      * An opcode from include/formula/compiler.hxx
      */
-    sal_uInt16 const nOpCode;
+    sal_uInt16 nOpCode;
     /*
      * Pointer to list of strings
      */
@@ -53,7 +53,7 @@ struct ScFuncDescCore
     /*
      * Count of list of strings
      */
-    size_t const nResourceLen;
+    size_t nResourceLen;
     /*
      * 16-bit value:
      *
@@ -66,11 +66,11 @@ struct ScFuncDescCore
      * Bit 2: boolean flag whether function is hidden in the Function
      * Wizard unless used in an expression.
      */
-    sal_uInt16 const nFunctionFlags;
+    sal_uInt16 nFunctionFlags;
     /*
      * Function group (text, math, ...), one of ID_FUNCTION_GRP_...
      */
-    sal_uInt16 const nCategory;
+    sal_uInt16 nCategory;
     /*
      * Help ID, HID_FUNC_...
      */
@@ -82,12 +82,12 @@ struct ScFuncDescCore
      * paired parameters, or PAIRED_VAR_ARGS+number if number of fixed
      * parameters and variable paired arguments following.
      */
-    sal_uInt16 const nArgs;
+    sal_uInt16 nArgs;
     /*
      * For every parameter:
      *     Boolean flag whether the parameter is optional.
      */
-    sal_uInt8 const aOptionalArgs[7];
+    sal_uInt8 aOptionalArgs[7];
 };
 
 }
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 982dd2314434..eda1f25551ef 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -399,7 +399,7 @@ struct CaseInsensitiveNamePredicate : svl::StyleSheetPredicate
     }
 
     OUString mUppercaseName;
-    SfxStyleFamily const mFamily;
+    SfxStyleFamily mFamily;
 };
 
 }
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 61624ed2c255..c40ce2467724 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -145,7 +145,7 @@ struct SetRowHeightOnlyFunc : public OptimalHeightsFuncObjBase
 struct SetRowHeightRangeFunc : public OptimalHeightsFuncObjBase
 {
     ScTable* mpTab;
-    double const mnPPTY;
+    double mnPPTY;
 
     SetRowHeightRangeFunc(ScTable* pTab, double nPPTY) :
         mpTab(pTab),
@@ -2124,7 +2124,7 @@ namespace {
 
 class SetTableIndex
 {
-    SCTAB const mnTab;
+    SCTAB mnTab;
 public:
     explicit SetTableIndex(SCTAB nTab) : mnTab(nTab) {}
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index b3aef84bec14..3828476810f2 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -66,7 +66,7 @@ namespace {
 class ColumnRegroupFormulaCells
 {
     ScColContainer& mrCols;
-    std::vector<ScAddress>* const mpGroupPos;
+    std::vector<ScAddress>* mpGroupPos;
 
 public:
     ColumnRegroupFormulaCells( ScColContainer& rCols, std::vector<ScAddress>* pGroupPos ) :
@@ -793,12 +793,12 @@ namespace {
 class TransClipHandler
 {
     ScTable& mrClipTab;
-    SCTAB const mnSrcTab;
-    SCCOL const mnSrcCol;
-    size_t const mnTopRow;
-    SCROW const mnTransRow;
-    bool const mbAsLink;
-    bool const mbWasCut;
+    SCTAB mnSrcTab;
+    SCCOL mnSrcCol;
+    size_t mnTopRow;
+    SCROW mnTransRow;
+    bool mbAsLink;
+    bool mbWasCut;
 
     ScAddress getDestPos(size_t nRow) const
     {
@@ -3683,8 +3683,8 @@ namespace {
 class OutlineArrayFinder
 {
     ScRange maRef;
-    SCCOL const mnCol;
-    SCTAB const mnTab;
+    SCCOL mnCol;
+    SCTAB mnTab;
     ScOutlineArray* mpArray;
     bool mbSizeChanged;
 
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 8858a161a501..efcf66894a10 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -261,7 +261,7 @@ private:
 
     std::vector<std::unique_ptr<ScSortInfo[]>> mvppInfo;
     SCCOLROW        nStart;
-    SCCOLROW const  mnLastIndex; /// index of last non-empty cell position.
+    SCCOLROW        mnLastIndex; /// index of last non-empty cell position.
 
     std::vector<SCCOLROW> maOrderIndices;
     bool mbKeepQuery;
@@ -597,8 +597,8 @@ struct SortedRowFlags
 
 struct PatternSpan
 {
-    SCROW const mnRow1;
-    SCROW const mnRow2;
+    SCROW mnRow1;
+    SCROW mnRow2;
     const ScPatternAttr* mpPattern;
 
     PatternSpan( SCROW nRow1, SCROW nRow2, const ScPatternAttr* pPat ) :
@@ -645,7 +645,7 @@ namespace {
 template<typename Hint, typename ReorderMap, typename Index>
 class ReorderNotifier
 {
-    Hint const maHint;
+    Hint maHint;
 public:
     ReorderNotifier( const ReorderMap& rMap, SCTAB nTab, Index nPos1, Index nPos2 ) :
         maHint(rMap, nTab, nPos1, nPos2) {}
@@ -2207,7 +2207,7 @@ class QueryEvaluator
     svl::SharedStringPool& mrStrPool;
     const ScTable& mrTab;
     const ScQueryParam& mrParam;
-    bool const mpTestEqualCondition;
+    bool mpTestEqualCondition;
     utl::TransliterationWrapper* mpTransliteration;
     CollatorWrapper* mpCollator;
     const bool mbMatchWholeCell;