diff options
Diffstat (limited to 'sc/source')
267 files changed, 1133 insertions, 1130 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; diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx index f17f041af690..bc0a22ee3315 100644 --- a/sc/source/core/inc/adiasync.hxx +++ b/sc/source/core/inc/adiasync.hxx @@ -43,8 +43,8 @@ private: }; std::unique_ptr<ScAddInDocs> pDocs; // List of using documents LegacyFuncData* mpFuncData; // Pointer to data in collection - sal_uLong const nHandle; // is casted from double to sal_uLong - ParamType const meType; // result of type PTR_DOUBLE or PTR_STRING + sal_uLong nHandle; // is casted from double to sal_uLong + ParamType meType; // result of type PTR_DOUBLE or PTR_STRING bool bValid; // is value valid? public: diff --git a/sc/source/core/inc/arraysumfunctor.hxx b/sc/source/core/inc/arraysumfunctor.hxx index f1182874b1a1..5006064af9e7 100644 --- a/sc/source/core/inc/arraysumfunctor.hxx +++ b/sc/source/core/inc/arraysumfunctor.hxx @@ -24,7 +24,7 @@ struct ArraySumFunctor { private: const double* mpArray; - size_t const mnSize; + size_t mnSize; public: ArraySumFunctor(const double* pArray, size_t nSize) diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index 36374d9b6dba..bf972af37ef6 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -93,7 +93,7 @@ inline bool ScBroadcastArea::operator==( const ScBroadcastArea & rArea ) const struct ScBroadcastAreaEntry { - ScBroadcastArea* const mpArea; + ScBroadcastArea* mpArea; mutable bool mbErasure; ///< TRUE if marked for erasure in this set ScBroadcastAreaEntry( ScBroadcastArea* p ) : mpArea( p), mbErasure( false) {} @@ -350,7 +350,7 @@ public: class ScBulkBroadcast { ScBroadcastAreaSlotMachine* pBASM; - SfxHintId const mnHintId; + SfxHintId mnHintId; ScBulkBroadcast(ScBulkBroadcast const &) = delete; ScBulkBroadcast(ScBulkBroadcast &&) = delete; diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx index c521d944cf4b..94592b848284 100644 --- a/sc/source/core/inc/cellkeytranslator.hxx +++ b/sc/source/core/inc/cellkeytranslator.hxx @@ -33,7 +33,7 @@ struct TransItem; struct ScCellKeyword { const char* mpName; - OpCode const meOpCode; + OpCode meOpCode; const css::lang::Locale& mrLocale; ScCellKeyword(const char* pName, OpCode eOpCode, const css::lang::Locale& rLocale); diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index bd35b7d905e1..dc1b93ba96c6 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -85,7 +85,7 @@ protected: static void fillQueryOptions(ScQueryParamBase* pParam); private: - ScDocument* const mpDoc; + ScDocument* mpDoc; }; class ScDBInternalRange : public ScDBRangeBase @@ -126,7 +126,7 @@ public: virtual bool isRangeEqual(const ScRange& rRange) const override; private: - ScRange const maRange; + ScRange maRange; }; class ScDBExternalRange : public ScDBRangeBase diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index f3390902385a..f764d7ae1ec2 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -221,7 +221,7 @@ private: FormulaError mnStringNoValueError; // the error set in ConvertStringToValue() if no value SubtotalFlags mnSubTotalFlags; // flags for subtotal and aggregate functions sal_uInt8 cPar; // current count of parameters - bool const bCalcAsShown; // precision as shown + bool bCalcAsShown; // precision as shown bool bMatrixFormula; // formula cell is a matrix formula VolatileType meVolatileType; diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx index 7c8fbf558c30..23c17a3b003f 100644 --- a/sc/source/core/inc/jumpmatrix.hxx +++ b/sc/source/core/inc/jumpmatrix.hxx @@ -61,13 +61,13 @@ class ScJumpMatrix ScMatrixRef pMat; // the results ScRefList mvRefList; // array of references result, if any ScTokenVec mvParams; // parameter stack - SCSIZE const nCols; + SCSIZE nCols; SCSIZE nRows; SCSIZE nCurCol; SCSIZE nCurRow; SCSIZE nResMatCols; SCSIZE nResMatRows; - OpCode const meOp; + OpCode meOp; bool bStarted; // Buffer result ranges to be able to set a range of identically typed diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx index e6b71bd695b2..c7cf0639fba5 100644 --- a/sc/source/core/inc/poolhelp.hxx +++ b/sc/source/core/inc/poolhelp.hxx @@ -41,7 +41,7 @@ private: mutable std::unique_ptr<SvNumberFormatter> pFormTable; mutable SfxItemPool* pEditPool; // EditTextObjectPool mutable SfxItemPool* pEnginePool; // EditEnginePool - ScDocument* const m_pSourceDoc; + ScDocument* m_pSourceDoc; public: ScPoolHelper( ScDocument* pSourceDoc ); diff --git a/sc/source/core/inc/webservicelink.hxx b/sc/source/core/inc/webservicelink.hxx index 8d7436283cb9..215a5ddb903e 100644 --- a/sc/source/core/inc/webservicelink.hxx +++ b/sc/source/core/inc/webservicelink.hxx @@ -32,7 +32,7 @@ class ScWebServiceLink : public ::sfx2::SvBaseLink, public SvtBroadcaster { private: ScDocument* pDoc; - OUString const aURL; // connection/ link data + OUString aURL; // connection/ link data bool bHasResult; // is set aResult is useful OUString aResult; diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 9ed14b24929d..0feb156aa5ea 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -1397,7 +1397,7 @@ protected: class Reduction : public SlidingFunctionBase { - int const mnResultSize; + int mnResultSize; public: explicit Reduction(int nResultSize) : mnResultSize(nResultSize) {} @@ -3847,8 +3847,8 @@ public: cl_mem GetResultBuffer() const { return mpResClmem; } private: - ScCalcConfig const mCalcConfig; - FormulaTreeNodeRef const mpRoot; + ScCalcConfig mCalcConfig; + FormulaTreeNodeRef mpRoot; SymbolTable mSyms; std::string mKernelSignature, mKernelHash; std::string mFullProgramSrc; @@ -3858,7 +3858,7 @@ private: std::set<std::string> inlineDecl; std::set<std::string> inlineFun; - int const mnResultSize; + int mnResultSize; }; } @@ -4241,9 +4241,9 @@ namespace { class CLInterpreterResult { - DynamicKernel* const mpKernel; + DynamicKernel* mpKernel; - SCROW const mnGroupLength; + SCROW mnGroupLength; cl_mem mpCLResBuf; double* mpResBuf; @@ -4314,7 +4314,7 @@ class CLInterpreterContext std::shared_ptr<DynamicKernel> mpKernelStore; /// for managed kernel instance. DynamicKernel* mpKernel; - SCROW const mnGroupLength; + SCROW mnGroupLength; public: explicit CLInterpreterContext(SCROW nGroupLength) diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx index 1e36e7c1a29f..a58be12345fe 100644 --- a/sc/source/core/opencl/opbase.hxx +++ b/sc/source/core/opencl/opbase.hxx @@ -35,7 +35,7 @@ public: std::string mMessage; std::string mFile; - int const mLineNumber; + int mLineNumber; }; /// Failed in marshaling @@ -47,7 +47,7 @@ public: std::string mFunction; cl_int mError; std::string mFile; - int const mLineNumber; + int mLineNumber; }; /// Inconsistent state @@ -57,7 +57,7 @@ public: Unhandled( const std::string& fn, int ln ); std::string mFile; - int const mLineNumber; + int mLineNumber; }; class InvalidParameterCount @@ -95,7 +95,7 @@ public: } private: - formula::FormulaConstTokenRef const mpCurrentFormula; + formula::FormulaConstTokenRef mpCurrentFormula; }; /// (Partially) abstract base class for an operand @@ -146,7 +146,7 @@ public: protected: const ScCalcConfig& mCalcConfig; std::string mSymName; - FormulaTreeNodeRef const mFormulaTree; + FormulaTreeNodeRef mFormulaTree; }; typedef std::shared_ptr<DynamicKernelArgument> DynamicKernelArgumentRef; diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx index 6f814f975bf0..3f5930925724 100644 --- a/sc/source/core/tool/callform.cxx +++ b/sc/source/core/tool/callform.cxx @@ -78,7 +78,7 @@ typedef void (CALLTYPE* Unadvice)( double& nHandle ); class ModuleData { friend class ModuleCollection; - OUString const aName; + OUString aName; std::unique_ptr<osl::Module> pInstance; public: ModuleData(const ModuleData&) = delete; diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index 7878d1a47d57..71d84899f79c 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.cxx @@ -187,7 +187,7 @@ struct TransItem { const sal_Unicode* from; const char* to; - OpCode const func; + OpCode func; }; void ScCellKeywordTranslator::init() diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index f5560479e109..98d64e5446e5 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -256,7 +256,7 @@ private: private: ScDocument* mpDoc; ScChartListener& mrParent; - bool const mbStart; + bool mbStart; }; } diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index a9dcf4fa75b0..0c1e9e5d07bb 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -4449,7 +4449,7 @@ namespace { class ExternalFileInserter { - ScAddress const maPos; + ScAddress maPos; ScExternalRefManager& mrRefMgr; public: ExternalFileInserter(const ScAddress& rPos, ScExternalRefManager& rRefMgr) : diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 1a0d7b98e297..51b2ecc6be62 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -747,7 +747,7 @@ public: } private: - OUString const maSearchName; + OUString maSearchName; }; /** Set a numbered table column name at given nIndex, preventing duplicates, @@ -944,7 +944,7 @@ namespace { class FindByTable { - SCTAB const mnTab; + SCTAB mnTab; public: explicit FindByTable(SCTAB nTab) : mnTab(nTab) {} @@ -958,17 +958,17 @@ public: class UpdateRefFunc { - ScDocument* const mpDoc; - UpdateRefMode const meMode; - SCCOL const mnCol1; - SCROW const mnRow1; - SCTAB const mnTab1; - SCCOL const mnCol2; - SCROW const mnRow2; - SCTAB const mnTab2; - SCCOL const mnDx; - SCROW const mnDy; - SCTAB const mnDz; + ScDocument* mpDoc; + UpdateRefMode meMode; + SCCOL mnCol1; + SCROW mnRow1; + SCTAB mnTab1; + SCCOL mnCol2; + SCROW mnRow2; + SCTAB mnTab2; + SCCOL mnDx; + SCROW mnDy; + SCTAB mnDz; public: UpdateRefFunc(ScDocument* pDoc, UpdateRefMode eMode, @@ -988,8 +988,8 @@ public: class UpdateMoveTabFunc { - SCTAB const mnOldTab; - SCTAB const mnNewTab; + SCTAB mnOldTab; + SCTAB mnNewTab; public: UpdateMoveTabFunc(SCTAB nOld, SCTAB nNew) : mnOldTab(nOld), mnNewTab(nNew) {} void operator() (std::unique_ptr<ScDBData> const& p) @@ -1000,10 +1000,10 @@ public: class FindByCursor { - SCCOL const mnCol; - SCROW const mnRow; - SCTAB const mnTab; - ScDBDataPortion const mePortion; + SCCOL mnCol; + SCROW mnRow; + SCTAB mnTab; + ScDBDataPortion mePortion; public: FindByCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) : mnCol(nCol), mnRow(nRow), mnTab(nTab), mePortion(ePortion) {} @@ -1029,7 +1029,7 @@ public: class FindByIndex { - sal_uInt16 const mnIndex; + sal_uInt16 mnIndex; public: explicit FindByIndex(sal_uInt16 nIndex) : mnIndex(nIndex) {} bool operator() (std::unique_ptr<ScDBData> const& p) const diff --git a/sc/source/core/tool/formulalogger.cxx b/sc/source/core/tool/formulalogger.cxx index 3b172e26bb88..cb072c7a4ef8 100644 --- a/sc/source/core/tool/formulalogger.cxx +++ b/sc/source/core/tool/formulalogger.cxx @@ -62,11 +62,11 @@ struct FormulaLogger::GroupScope::Impl FormulaLogger& mrLogger; const ScDocument& mrDoc; - OUString const maPrefix; + OUString maPrefix; std::vector<OUString> maMessages; bool mbCalcComplete; - bool const mbOutputEnabled; + bool mbOutputEnabled; Impl( FormulaLogger& rLogger, const OUString& rPrefix, const ScDocument& rDoc, const ScFormulaCell& rCell, bool bOutputEnabled ) : diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index dd03b0c9084e..ecacb21a1a59 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -4691,7 +4691,7 @@ public: private: const ScMatrix& mrMat; - bool const mbColVec; + bool mbColVec; }; /** returns -1 when the matrix value is smaller than the query value, 0 when @@ -8958,8 +8958,8 @@ void ScInterpreter::ScLeft() namespace { struct UBlockScript { - UBlockCode const from; - UBlockCode const to; + UBlockCode from; + UBlockCode to; }; } diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index ad9db97873bc..994d821f6d80 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -2252,7 +2252,7 @@ class ScTDistFunction : public ScDistFunc { ScInterpreter& rInt; double fp, fDF; - int const nT; + int nT; public: ScTDistFunction( ScInterpreter& rI, double fpVal, double fDFVal, int nType ) : diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 39706cf7882c..278e253531ec 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -80,7 +80,7 @@ namespace { class ScETSForecastCalculation { private: - SvNumberFormatter* const mpFormatter; + SvNumberFormatter* mpFormatter; std::vector< DataPoint > maRange; // data (X, Y) std::unique_ptr<double[]> mpBase; // calculated base value array std::unique_ptr<double[]> mpTrend; // calculated trend factor array diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index f4507dbe64da..0e416276324c 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -34,7 +34,7 @@ const size_t MAXQUERY = 8; class FindByField { - SCCOLROW const mnField; + SCCOLROW mnField; public: explicit FindByField(SCCOLROW nField) : mnField(nField) {} bool operator() (const std::unique_ptr<ScQueryEntry>& rpEntry) const diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 76b68d1a1b27..d0669aa97b90 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -1318,7 +1318,7 @@ public: return false; } private: - ScDocument * const mpDoc; + ScDocument *mpDoc; }; } diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 869a91406d56..9aa4ad1b6941 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -2306,9 +2306,9 @@ template<typename T, typename U, typename return_type> struct MatrixIteratorWrapper { private: - typename T::const_iterator const m_itBegin; - typename T::const_iterator const m_itEnd; - U const maOp; + typename T::const_iterator m_itBegin; + typename T::const_iterator m_itEnd; + U maOp; public: MatrixIteratorWrapper(typename T::const_iterator const & itBegin, typename T::const_iterator const & itEnd, U const & aOp): m_itBegin(itBegin), diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 9ba5f2f5f15b..fc08062c965f 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -136,7 +136,7 @@ namespace struct TokenPointers { TokenPointerRange maPointerRange[2]; - bool const mbSkipRelName; + bool mbSkipRelName; TokenPointers( FormulaToken** pCode, sal_uInt16 nLen, FormulaToken** pRPN, sal_uInt16 nRPN, bool bSkipRelName = true ) : diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx index 1a248b7c5914..6d68545e3284 100644 --- a/sc/source/core/tool/userlist.cxx +++ b/sc/source/core/tool/userlist.cxx @@ -33,7 +33,7 @@ namespace { class FindByName { const OUString& mrName; - bool const mbUpper; + bool mbUpper; public: FindByName(const OUString& rName, bool bUpper) : mrName(rName), mbUpper(bUpper) {} bool operator() (const ScUserListData::SubStr& r) const diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 30c973abda8e..623aab35414e 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -1594,7 +1594,7 @@ public: virtual void Save( XclExpStream& rStrm ) override; private: XclExpPivotTableManager& mrPTMgr; - SCTAB const mnScTab; + SCTAB mnScTab; }; XclExpPivotRecWrapper::XclExpPivotRecWrapper( XclExpPivotTableManager& rPTMgr, SCTAB nScTab ) : diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx index 91958bbf82a4..3942a519eb97 100644 --- a/sc/source/filter/excel/xepivotxml.cxx +++ b/sc/source/filter/excel/xepivotxml.cxx @@ -662,7 +662,7 @@ namespace { struct DataField { - long const mnPos; // field index in pivot cache. + long mnPos; // field index in pivot cache. const ScDPSaveDimension* mpDim; DataField( long nPos, const ScDPSaveDimension* pDim ) : mnPos(nPos), mpDim(pDim) {} diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 03a63404d696..b2d2b7bdd82c 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -128,7 +128,7 @@ class XclListColor { private: Color maColor; /// The color value of this palette entry. - sal_uInt32 const mnColorId; /// Unique color ID for color reduction. + sal_uInt32 mnColorId; /// Unique color ID for color reduction. sal_uInt32 mnWeight; /// Weighting for color reduction. bool mbBaseColor; /// true = Handle as base color, (don't remove/merge). @@ -1315,7 +1315,7 @@ namespace { /** Predicate for search algorithm. */ struct XclExpNumFmtPred { - sal_uInt32 const mnScNumFmt; + sal_uInt32 mnScNumFmt; explicit XclExpNumFmtPred( sal_uInt32 nScNumFmt ) : mnScNumFmt( nScNumFmt ) {} bool operator()( const XclExpNumFmt& rFormat ) const { return rFormat.mnScNumFmt == mnScNumFmt; } diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index d7da927baddb..fb08932872f1 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -29,9 +29,9 @@ namespace{ struct XclPaperSize { - Paper const mePaper; /// SVX paper size identifier. - long const mnWidth; /// Paper width in twips. - long const mnHeight; /// Paper height in twips. + Paper mePaper; /// SVX paper size identifier. + long mnWidth; /// Paper width in twips. + long mnHeight; /// Paper height in twips. }; constexpr long in2twips(double n_inch) diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index cf87e8aeafd0..0b29717b0bfe 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -771,9 +771,9 @@ constexpr LanguageType PRV_LANGUAGE_ASIAN_PRIM = primary(LANGUAGE_CHINESE); struct XclBuiltInFormat { sal_uInt16 mnXclNumFmt; /// Excel built-in index. - const char* mpFormat; /// Format string, may be 0 (meOffset used then). - NfIndexTableOffset const meOffset; /// SvNumberFormatter format index, if mpFormat==0. - sal_uInt16 const mnXclReuseFmt; /// Use this Excel format, if meOffset==PRV_NF_INDEX_REUSE. + const char* mpFormat; /// Format string, may be 0 (meOffset used then). + NfIndexTableOffset meOffset; /// SvNumberFormatter format index, if mpFormat==0. + sal_uInt16 mnXclReuseFmt; /// Use this Excel format, if meOffset==PRV_NF_INDEX_REUSE. }; /** Defines a literal Excel built-in number format. */ @@ -1400,7 +1400,7 @@ static const XclBuiltInFormat spBuiltInFormats_THAI[] = struct XclBuiltInFormatTable { LanguageType meLanguage; /// The language of this table. - LanguageType const meParentLang; /// The language of the parent table. + LanguageType meParentLang; /// The language of the parent table. const XclBuiltInFormat* mpFormats; /// The number format table. }; diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index 0b620f0cd706..70116fd095e7 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -49,7 +49,7 @@ public: class ScCTB : public TBBase { - sal_uInt16 const nViews; + sal_uInt16 nViews; TB tb; std::vector<TBVisualData> rVisualData; sal_uInt32 ectbid; diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index d8c5eb6f13c9..e6fce7474725 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -363,8 +363,8 @@ namespace { const struct XclCodePageEntry { - sal_uInt16 const mnCodePage; - rtl_TextEncoding const meTextEnc; + sal_uInt16 mnCodePage; + rtl_TextEncoding meTextEnc; } pCodePageTable[] = { @@ -411,14 +411,14 @@ struct XclCodePageEntry_CPPred { explicit XclCodePageEntry_CPPred( sal_uInt16 nCodePage ) : mnCodePage( nCodePage ) {} bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.mnCodePage == mnCodePage; } - sal_uInt16 const mnCodePage; + sal_uInt16 mnCodePage; }; struct XclCodePageEntry_TEPred { explicit XclCodePageEntry_TEPred( rtl_TextEncoding eTextEnc ) : meTextEnc( eTextEnc ) {} bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.meTextEnc == meTextEnc; } - rtl_TextEncoding const meTextEnc; + rtl_TextEncoding meTextEnc; }; } // namespace diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 50e46cd0df82..5ac54f447bee 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -44,7 +44,7 @@ public: class XclExpUserBView : public ExcRecord { private: - XclExpString const sUsername; + XclExpString sUsername; sal_uInt8 aGUID[ 16 ]; virtual void SaveCont( XclExpStream& rStrm ) override; @@ -159,7 +159,7 @@ public: class XclExpChTrEmpty : public ExcRecord { private: - sal_uInt16 const nRecNum; + sal_uInt16 nRecNum; public: XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {} @@ -188,8 +188,8 @@ public: class XclExpChTr0x0194 : public ExcRecord { private: - XclExpString const sUsername; - DateTime const aDateTime; + XclExpString sUsername; + DateTime aDateTime; virtual void SaveCont( XclExpStream& rStrm ) override; @@ -244,10 +244,10 @@ class XclExpChTrAction; class XclExpXmlChTrHeader : public ExcXmlRecord { - OUString const maUserName; - DateTime const maDateTime; + OUString maUserName; + DateTime maDateTime; sal_uInt8 maGUID[16]; - sal_Int32 const mnLogNumber; + sal_Int32 mnLogNumber; sal_uInt32 mnMinAction; sal_uInt32 mnMaxAction; @@ -269,8 +269,8 @@ public: class XclExpChTrInfo : public ExcRecord { private: - XclExpString const sUsername; - DateTime const aDateTime; + XclExpString sUsername; + DateTime aDateTime; sal_uInt8 aGUID[ 16 ]; virtual void SaveCont( XclExpStream& rStrm ) override; @@ -293,7 +293,7 @@ private: std::unique_ptr<sal_uInt16[]> pBuffer; sal_uInt16* pLast; - sal_uInt16 const nBufSize; + sal_uInt16 nBufSize; sal_uInt16 nLastId; public: @@ -341,12 +341,12 @@ public: class XclExpChTrAction : public ExcRecord { private: - OUString const sUsername; + OUString sUsername; DateTime aDateTime; sal_uInt32 nIndex; // action number std::unique_ptr<XclExpChTrAction> pAddAction; // additional record for this action - bool const bAccepted; + bool bAccepted; protected: const XclExpTabInfo& rTabInfo; // for table num export (sc num -> xcl num) @@ -465,7 +465,7 @@ class XclExpChTrCellContent final : public XclExpChTrAction, protected XclExpRoo std::unique_ptr<XclExpChTrData> pOldData; std::unique_ptr<XclExpChTrData> pNewData; sal_uInt16 nOldLength; // this is not the record size - ScAddress const aPosition; + ScAddress aPosition; static void MakeEmptyChTrData( std::unique_ptr<XclExpChTrData>& rpData ); @@ -522,7 +522,7 @@ public: class XclExpChTrInsertTab : public XclExpChTrAction, protected XclExpRoot { private: - SCTAB const nTab; + SCTAB nTab; protected: virtual void SaveActionData( XclExpStream& rStrm ) const override; @@ -545,7 +545,7 @@ public: class XclExpChTrMoveRange final : public XclExpChTrAction { ScRange aSourceRange; - ScRange const aDestRange; + ScRange aDestRange; virtual void SaveActionData( XclExpStream& rStrm ) const override; virtual void PrepareSaveAction( XclExpStream& rStrm ) const override; diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index c80012a9ac68..e2d9f3255ac5 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -39,7 +39,7 @@ struct CommentModel bool mbRowHidden; /// Comment cell's Row is Hidden sal_Int32 mnTHA; /// Horizontal Alignment sal_Int32 mnTVA; /// Vertical Alignment - css::awt::Rectangle const maAnchor; /// Anchor parameters + css::awt::Rectangle maAnchor; /// Anchor parameters explicit CommentModel(); }; diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 8aa85427b85f..f3c750afb525 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -258,7 +258,7 @@ class ExtCfDataBarRule : public WorksheetHelper }; ExCfRuleModel maModel; RuleType mnRuleType; - ScDataBarFormatData* const mpTarget; + ScDataBarFormatData* mpTarget; public: ExtCfDataBarRule(ScDataBarFormatData* pTarget, const WorksheetHelper& rParent); @@ -284,7 +284,7 @@ public: private: std::vector< std::unique_ptr<ScFormatEntry> > maEntries; std::vector<sal_Int32> maPriorities; - ScRangeList const maRange; + ScRangeList maRange; }; typedef std::shared_ptr< CondFormat > CondFormatRef; diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 50fcc9da5b54..de9e9c27f008 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -132,9 +132,9 @@ private: private: css::uno::Reference< css::container::XIndexContainer > mxCtrlFormIC; - sal_Int32 const mnCtrlIndex; - sal_Int32 const mnCtrlType; - sal_Int32 const mnDropStyle; + sal_Int32 mnCtrlIndex; + sal_Int32 mnCtrlType; + sal_Int32 mnDropStyle; }; class VmlDrawing : public ::oox::vml::Drawing, public WorksheetHelper @@ -187,7 +187,7 @@ private: const ::oox::vml::ShapeBase& rShape ) const; private: - ::oox::ole::ControlConverter const maControlConv; + ::oox::ole::ControlConverter maControlConv; ::oox::vml::TextFontModel maListBoxFont; }; diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index dbd0cbd56137..68183e84b2f7 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -100,7 +100,7 @@ class ScEEParser protected: EditEngine* pEdit; SfxItemPool* pPool; - SfxItemPool* const pDocPool; + SfxItemPool* pDocPool; std::vector<std::shared_ptr<ScEEParseEntry>> maList; std::shared_ptr<ScEEParseEntry> mxActEntry; ColWidthsMap maColWidths; diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx index 879d5882d611..df90b1b2fb5e 100644 --- a/sc/source/filter/inc/excdoc.hxx +++ b/sc/source/filter/inc/excdoc.hxx @@ -47,8 +47,8 @@ private: XclExpRecordList<> aRecList; XclExpCellTableRef mxCellTable; - SCTAB const mnScTab; // table number SC document - sal_uInt16 const nExcTab; // table number Excel document + SCTAB mnScTab; // table number SC document + sal_uInt16 nExcTab; // table number Excel document XclExpNoteListRef mxNoteList; diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index cde21d76c12e..4851952b4f0c 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -38,7 +38,7 @@ protected: static const sal_uInt16 nRowMask; - XclFunctionProvider const maFuncProv; + XclFunctionProvider maFuncProv; const XclBiff meBiff; void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs ); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 74a21cbfa563..dadeef2ae165 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -175,7 +175,7 @@ class XclExpProtection : public XclExpBoolRecord class XclExpSheetProtection : public XclExpProtection { - SCTAB const mnTab; + SCTAB mnTab; public: XclExpSheetProtection(bool bValue, SCTAB nTab); virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -238,7 +238,7 @@ protected: sal_uInt64 m_nStrPos; sal_uInt64 m_nOwnPos; // Position after # and Len sal_uInt16 nGrbit; - SCTAB const nTab; + SCTAB nTab; ExcBundlesheetBase(); @@ -310,10 +310,10 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - SCTAB const mnScTab; + SCTAB mnScTab; XclExpFilterManager* mpManager; - bool const mbFitToPage; - Color const maTabColor; + bool mbFitToPage; + Color maTabColor; }; class XclExpFiltermode : public XclExpEmptyRecord @@ -331,7 +331,7 @@ public: SCCOL GetColCount() const { return static_cast< SCCOL >( GetValue() ); } private: - ScAddress const maStartPos; + ScAddress maStartPos; }; class ExcFilterCondition diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx index e8e233148897..554a01674c68 100644 --- a/sc/source/filter/inc/expbase.hxx +++ b/sc/source/filter/inc/expbase.hxx @@ -32,7 +32,7 @@ class ScExportBase protected: SvStream& rStrm; - ScRange const aRange; + ScRange aRange; ScDocument* pDoc; SvNumberFormatter* pFormatter; std::unique_ptr<ScFieldEditEngine> diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx index 3f2085d5ed81..38f353e47f85 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -36,7 +36,7 @@ public: virtual void onStartElement( const AttributeList& rAttribs ) override; private: - ScDataBarFormatData* const mpTarget; + ScDataBarFormatData* mpTarget; bool mbFirstEntry; }; diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 3d3a0147f00e..8e0c151d3082 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -523,7 +523,7 @@ public: private: const FunctionParamInfo* mpParamInfo; const FunctionParamInfo* mpParamInfoEnd; - bool const mbParamPairs; + bool mbParamPairs; }; // Base function provider ===================================================== @@ -563,7 +563,7 @@ protected: private: typedef std::shared_ptr< FunctionProviderImpl > FunctionProviderImplRef; - FunctionProviderImplRef const mxFuncImpl; /// Shared implementation between all copies of the provider. + FunctionProviderImplRef mxFuncImpl; /// Shared implementation between all copies of the provider. }; // Op-code and function provider ============================================== @@ -598,7 +598,7 @@ public: private: typedef std::shared_ptr< OpCodeProviderImpl > OpCodeProviderImplRef; - OpCodeProviderImplRef const mxOpCodeImpl; /// Shared implementation between all copies of the provider. + OpCodeProviderImplRef mxOpCodeImpl; /// Shared implementation between all copies of the provider. }; // API formula parser wrapper ================================================= diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index 35c117315550..3d6a9f8d9b94 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -24,9 +24,9 @@ public: */ struct SharedFormulaEntry { - ScAddress const maAddress; - OUString const maTokenStr; - sal_Int32 const mnSharedId; + ScAddress maAddress; + OUString maTokenStr; + sal_Int32 mnSharedId; SharedFormulaEntry( const ScAddress& rAddress, @@ -38,10 +38,10 @@ public: */ struct SharedFormulaDesc { - ScAddress const maAddress; - sal_Int32 const mnSharedId; - OUString const maCellValue; - sal_Int32 const mnValueType; + ScAddress maAddress; + sal_Int32 mnSharedId; + OUString maCellValue; + sal_Int32 mnValueType; SharedFormulaDesc( const ScAddress& rAddr, sal_Int32 nSharedId, @@ -50,15 +50,15 @@ public: struct TokenAddressItem { - OUString const maTokenStr; - ScAddress const maAddress; + OUString maTokenStr; + ScAddress maAddress; TokenAddressItem( const OUString& rTokenStr, const ScAddress& rAddress ) : maTokenStr( rTokenStr ), maAddress( rAddress ) {} }; struct TokenRangeAddressItem { - TokenAddressItem const maTokenAndAddress; - ScRange const maRange; + TokenAddressItem maTokenAndAddress; + ScRange maRange; TokenRangeAddressItem( const TokenAddressItem& rTokenAndAddress, const ScRange& rRange ) : maTokenAndAddress( rTokenAndAddress ), maRange( rRange ) {} }; diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index 0d80b3f686fc..b2682dde9341 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -155,7 +155,7 @@ private: typedef ::std::unique_ptr< ScfProgressBar > ScfProgressBarPtr; ScfProgressBarPtr mxProgress; /// Pointer to sub progress bar for this segment. - std::size_t const mnSize; /// Size of this segment. + std::size_t mnSize; /// Size of this segment. std::size_t mnPos; /// Current position of this segment. explicit ScfProgressSegment( std::size_t nSize ); @@ -166,7 +166,7 @@ private: typedef std::vector< std::unique_ptr<ScfProgressSegment> > ScfSegmentList; ScfSegmentList maSegments; /// List of progress segments. - OUString const maText; /// UI string for system progress. + OUString maText; /// UI string for system progress. ScProgressPtr mxSysProgress; /// System progress bar. SfxObjectShell* mpDocShell; /// The document shell for the progress bar. diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index a2478f35e856..26e295afa207 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -76,11 +76,11 @@ struct ScHTMLStyle struct ScHTMLGraphEntry { - ScRange const aRange; // mapped range - Size const aSize; // size in pixels - Size const aSpace; // spacing in pixels - SdrObject* const pObject; - bool const bInCell; // if output is in cell + ScRange aRange; // mapped range + Size aSize; // size in pixels + Size aSpace; // spacing in pixels + SdrObject* pObject; + bool bInCell; // if output is in cell bool bWritten; ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange, @@ -113,7 +113,7 @@ class ScHTMLExport : public ScExportBase GraphEntryList aGraphList; ScHTMLStyle aHTMLStyle; OUString aBaseURL; - OUString const aStreamPath; + OUString aStreamPath; VclPtr<OutputDevice> pAppWin; // for Pixel-work FileNameMapPtr pFileNameMap; // for CopyLocalFileToINet OUString aNonConvertibleChars; // collect nonconvertible characters @@ -121,10 +121,10 @@ class ScHTMLExport : public ScExportBase SCTAB nUsedTables; short nIndent; char sIndent[nIndentMax+1]; - bool const bAll; // whole document + bool bAll; // whole document bool bTabHasGraphics; bool bTabAlignedLeft; - bool const bCalcAsShown; + bool bCalcAsShown; bool bCopyLocalFileToINet; bool bTableDataHeight; bool mbSkipImages; diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 36801bba7fb2..e0d44c0c004c 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -97,18 +97,18 @@ typedef o3tl::sorted_vector<sal_uLong> ScHTMLColOffset; struct ScHTMLTableStackEntry { - ScRangeListRef const xLockedList; + ScRangeListRef xLockedList; std::shared_ptr<ScEEParseEntry> xCellEntry; ScHTMLColOffset* pLocalColOffset; - sal_uLong const nFirstTableCell; - SCROW const nRowCnt; - SCCOL const nColCntStart; - SCCOL const nMaxCol; - sal_uInt16 const nTable; + sal_uLong nFirstTableCell; + SCROW nRowCnt; + SCCOL nColCntStart; + SCCOL nMaxCol; + sal_uInt16 nTable; sal_uInt16 nTableWidth; sal_uInt16 nColOffset; - sal_uInt16 const nColOffsetStart; - bool const bFirstRow; + sal_uInt16 nColOffsetStart; + bool bFirstRow; ScHTMLTableStackEntry( const std::shared_ptr<ScEEParseEntry>& rE, const ScRangeListRef& rL, ScHTMLColOffset* pTO, sal_uLong nFTC, @@ -129,9 +129,9 @@ struct ScHTMLTableStackEntry struct ScHTMLAdjustStackEntry { - SCCOL const nLastCol; - SCROW const nNextRow; - SCROW const nCurRow; + SCCOL nLastCol; + SCROW nNextRow; + SCROW nCurRow; ScHTMLAdjustStackEntry( SCCOL nLCol, SCROW nNRow, SCROW nCRow ) : nLastCol( nLCol ), nNextRow( nNRow ), @@ -151,7 +151,7 @@ class ScHTMLLayoutParser : public ScHTMLParser { private: Size aPageSize; - OUString const aBaseURL; + OUString aBaseURL; ::std::stack< std::unique_ptr<ScHTMLTableStackEntry> > aTableStack; OUString aString; @@ -536,7 +536,7 @@ private: ScHTMLPos maDocBasePos; /// Resulting base address in a Calc document. ScHTMLParser* mpParser; bool mbBorderOn:1; /// true = Table borders on. - bool const mbPreFormText:1; /// true = Table from preformatted text (<pre> tag). + bool mbPreFormText:1; /// true = Table from preformatted text (<pre> tag). bool mbRowOn:1; /// true = Inside of <tr> </tr>. bool mbDataOn:1; /// true = Inside of <td> </td> or <th> </th>. bool mbPushEmptyLine:1; /// true = Insert empty line before current entry. diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 123a1486b898..9f3c66bfb1dd 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -35,8 +35,8 @@ class ScTokenArray; class StringHashEntry { private: - OUString const aString; - sal_uInt32 const nHash; + OUString aString; + sal_uInt32 nHash; static sal_uInt32 MakeHashCode( const OUString& ); public: @@ -76,7 +76,7 @@ class RangeNameBufferWK3 final private: struct Entry { - StringHashEntry const aStrHashEntry; + StringHashEntry aStrHashEntry; ScComplexRefData aScComplexRefDataRel; sal_uInt16 nAbsInd; // == 0 -> no Abs-Name yet! sal_uInt16 nRelInd; @@ -126,8 +126,8 @@ class ExtSheetBuffer : public ExcRoot private: struct Cont { - OUString const aFile; - OUString const aTab; + OUString aFile; + OUString aTab; sal_uInt16 nTabNum; // 0xFFFF -> not set yet // 0xFFFE -> tried to set, but failed // 0xFFFD -> should be in the same workbook, but not found @@ -162,7 +162,7 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) struct ExtName { sal_uInt32 nStorageId; - sal_uInt16 const nFlags; + sal_uInt16 nFlags; ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {} diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index 220e32f32608..939b011cb5c4 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -31,7 +31,7 @@ public: class ScOrcusXMLContextImpl : public ScOrcusXMLContext { ScDocument& mrDoc; - OUString const maPath; + OUString maPath; orcus::xmlns_repository maNsRepo; /// XML namespace repository for this context. diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index ecf8f21168ec..6dcf80fc3c13 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -84,7 +84,7 @@ class ScOrcusNamedExpression : public orcus::spreadsheet::iface::import_named_ex { ScDocumentImport& mrDoc; const ScOrcusGlobalSettings& mrGlobalSettings; - SCTAB const mnTab; //< negative if global, else >= 0 for sheet-local named expressions. + SCTAB mnTab; //< negative if global, else >= 0 for sheet-local named expressions. public: ScOrcusNamedExpression( ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS, SCTAB nTab = -1 ); @@ -171,7 +171,7 @@ public: private: - SCTAB const mnTab; + SCTAB mnTab; ScDocument& mrDoc; std::unique_ptr<ScConditionalFormat> mpCurrentFormat; @@ -204,7 +204,7 @@ private: class ScOrcusSheetProperties : public orcus::spreadsheet::iface::import_sheet_properties { ScDocumentImport& mrDoc; - SCTAB const mnTab; + SCTAB mnTab; public: ScOrcusSheetProperties(SCTAB nTab, ScDocumentImport& rDoc); virtual ~ScOrcusSheetProperties() override; @@ -289,7 +289,7 @@ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet friend class ScOrcusArrayFormula; ScDocumentImport& mrDoc; - SCTAB const mnTab; + SCTAB mnTab; ScOrcusFactory& mrFactory; ScOrcusStyles& mrStyles; sc::SharedFormulaGroups maFormulaGroups; @@ -591,7 +591,7 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory FillDownCells }; - ScAddress const maPos; + ScAddress maPos; Type meType; OUString maStr1; diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index 41b876d26480..71d09f373e8b 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -143,8 +143,8 @@ public: private: struct HFHelperData { - sal_Int32 const mnLeftPropId; - sal_Int32 const mnRightPropId; + sal_Int32 mnLeftPropId; + sal_Int32 mnRightPropId; sal_Int32 mnHeight; sal_Int32 mnBodyDist; bool mbHasContent; diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 4c016766c17b..3758ad4afdc5 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -190,7 +190,7 @@ struct PCFieldGroupModel /** Helper struct for mapping original item names from/to group item names. */ struct PivotCacheGroupItem { - OUString const maOrigName; + OUString maOrigName; OUString maGroupName; explicit PivotCacheGroupItem( const OUString& rItemName ) : diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index 8b769a68308e..3c0579a7496a 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -177,7 +177,7 @@ private: ItemModelVector maItems; /// All items of this field. PTFieldModel maModel; /// Pivot field settings. OUString maDPFieldName; /// Name of the field in DataPilot field collection. - sal_Int32 const mnFieldIndex; /// Zero-based index of this field. + sal_Int32 mnFieldIndex; /// Zero-based index of this field. }; struct PTFilterModel diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index 6c25c481ba1b..520c80920bd4 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -52,7 +52,7 @@ enum QPRO_FUNC_TYPE class QProToSc : public ConverterBase { private: - TokenId const mnAddToken; + TokenId mnAddToken; SvStream& maIn; public: diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index f63cee7bf709..0829c3cc4459 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -75,7 +75,7 @@ private: ScenarioCellVector maCells; /// Scenario cells. ScenarioModel maModel; /// Scenario model data. - sal_Int16 const mnSheet; /// Index of the sheet this scenario is based on. + sal_Int16 mnSheet; /// Index of the sheet this scenario is based on. }; struct SheetScenariosModel @@ -106,7 +106,7 @@ private: typedef RefVector< Scenario > ScenarioVector; ScenarioVector maScenarios; SheetScenariosModel maModel; - sal_Int16 const mnSheet; + sal_Int16 mnSheet; }; class ScenarioBuffer : public WorkbookHelper diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 2c6137d24a48..9ecbb51b083c 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -210,7 +210,7 @@ private: struct MergedRange { ScRange maRange; /// The formatted cell range. - sal_Int32 const mnHorAlign; /// Horizontal alignment in the range. + sal_Int32 mnHorAlign; /// Horizontal alignment in the range. explicit MergedRange( const ScRange& rRange ); explicit MergedRange( const ScAddress& rAddress, sal_Int32 nHorAlign ); diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 8e746ef4fd80..562ec15abaa3 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -44,12 +44,12 @@ class SheetDataContext : public WorksheetContextBase SheetDataBuffer& mrSheetData; /// The sheet data buffer for cell content and formatting. CellModel maCellData; /// Position, contents, formatting of current imported cell. CellFormulaModel maFmlaData; /// Settings for a cell formula. - sal_Int16 const mnSheet; /// Index of the current sheet. + sal_Int16 mnSheet; /// Index of the current sheet. // If we are doing threaded parsing, this SheetDataContext // forms the inner loop for bulk data parsing, and for the // duration of this we can drop the solar mutex. #if MULTI_THREAD_SHEET_PARSING - SolarMutexReleaser const aReleaser; + SolarMutexReleaser aReleaser; #endif public: diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 598a47a4045f..0541f3cda65e 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -258,7 +258,7 @@ private: FontModel maModel; ApiFontData maApiData; ApiFontUsedFlags maUsedFlags; - bool const mbDxf; + bool mbDxf; }; typedef std::shared_ptr< Font > FontRef; @@ -459,7 +459,7 @@ private: private: BorderModel maModel; ApiBorderData maApiData; - bool const mbDxf; + bool mbDxf; }; typedef std::shared_ptr< Border > BorderRef; @@ -553,7 +553,7 @@ private: PatternModelRef mxPatternModel; GradientModelRef mxGradientModel; ApiSolidFillData maApiData; - bool const mbDxf; + bool mbDxf; }; typedef std::shared_ptr< Fill > FillRef; diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index a102303c5871..c6e19dd3f723 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -93,7 +93,7 @@ protected: private: XfRef mxXf; - bool const mbCellXf; /// True = cell XF, false = style XF. + bool mbCellXf; /// True = cell XF, false = style XF. }; class DxfContext : public WorkbookContextBase diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index 73e7fbee3cbc..7c3b246243ce 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -86,9 +86,9 @@ public: private: struct SheetInfo : public SheetInfoModel { - OUString const maCalcName; - OUString const maCalcQuotedName; - sal_Int16 const mnCalcSheet; + OUString maCalcName; + OUString maCalcQuotedName; + sal_Int16 mnCalcSheet; explicit SheetInfo( const SheetInfoModel& rModel, sal_Int16 nCalcSheet, const OUString& rCalcName ); }; diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 4b5b23b0d5e3..18f519b0d89b 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -125,7 +125,7 @@ private: XclEscherClientTextbox* pAdditionalText; sal_uInt16 nAdditionalText; sal_uInt32 mnNextKey; - bool const mbIsRootDff; + bool mbIsRootDff; }; // --- class XclEscherHostAppData ------------------------------------ diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 049f4aa57bee..3306a72a2007 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -86,7 +86,7 @@ public: private: static sal_Int32 mnDrawingMLCount, mnVmlCount; - SCTAB const mnScTab; + SCTAB mnScTab; XclEscherEx& mrEscherEx; std::unique_ptr<XclExpMsoDrawing> pMsodrawingPerSheet; @@ -108,9 +108,9 @@ protected: sal_uInt16 nObjId; sal_uInt16 nGrbit; SCTAB mnScTab; - bool const bFirstOnSheet; + bool bFirstOnSheet; - bool const mbOwnEscher; /// true = Escher part created on the fly. + bool mbOwnEscher; /// true = Escher part created on the fly. /** @param bOwnEscher If set to true, this object will create its escher data. See SetOwnEscher() for details. */ @@ -170,14 +170,14 @@ public: class XclObjComment : public XclObj { - ScAddress const maScPos; + ScAddress maScPos; // no need to use std::unique_ptr< SdrCaptionObj, SdrObjectFreeOp > - SdrCaptionObj* const mpCaption; + SdrCaptionObj* mpCaption; - bool const mbVisible; - tools::Rectangle const maFrom; - tools::Rectangle const maTo; + bool mbVisible; + tools::Rectangle maFrom; + tools::Rectangle maTo; public: XclObjComment( XclExpObjectManager& rObjMgr, @@ -198,7 +198,7 @@ public: class XclObjDropDown : public XclObj { private: - bool const bIsFiltered; + bool bIsFiltered; virtual void WriteSubRecs( XclExpStream& rStrm ) override; @@ -317,7 +317,7 @@ public: class ExcBundlesheet8 : public ExcBundlesheetBase { private: - OUString const sUnicodeName; + OUString sUnicodeName; XclExpString GetName() const { return XclExpString( sUnicodeName, XclStrFlags::EightBitLength );} virtual void SaveCont( XclExpStream& rStrm ) override; @@ -345,7 +345,7 @@ public: class XclCodename : public ExcRecord { private: - XclExpString const aName; + XclExpString aName; virtual void SaveCont( XclExpStream& rStrm ) override; public: XclCodename( const OUString& ); @@ -362,9 +362,9 @@ public: class ExcEScenarioCell { private: - sal_uInt16 const nCol; - sal_uInt16 nRow; - XclExpString const sText; + sal_uInt16 nCol; + sal_uInt16 nRow; + XclExpString sText; protected: public: diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index c3e069997ef6..56af63f8fff4 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -125,7 +125,7 @@ private: private: typedef std::unique_ptr< SvStream > SvStreamPtr; - ScAddress const maScPos; /// Position of the hyperlink. + ScAddress maScPos; /// Position of the hyperlink. OUString m_Repr; /// Cell representation text. SvStreamPtr mxVarData; /// Buffer stream with variable data. sal_uInt32 mnFlags; /// Option flags. @@ -192,7 +192,7 @@ public: private: const ScCondDateFormatEntry& mrFormatEntry; - sal_Int32 const mnPriority; + sal_Int32 mnPriority; }; class XclExpCfvo : public XclExpRecord, protected XclExpRoot @@ -203,8 +203,8 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const ScColorScaleEntry& mrEntry; - ScAddress const maSrcPos; - bool const mbFirst; + ScAddress maSrcPos; + bool mbFirst; }; class XclExpColScaleCol : public XclExpRecord, protected XclExpRoot @@ -258,7 +258,7 @@ private: XclExpCfvoList maCfvoList; XclExpColScaleColList maColList; - sal_Int32 const mnPriority; + sal_Int32 mnPriority; }; class XclExpDataBar : public XclExpRecord, protected XclExpRoot @@ -273,8 +273,8 @@ private: std::unique_ptr<XclExpColScaleCol> mpCol; const ScDataBarFormat& mrFormat; - sal_Int32 const mnPriority; - OString const maGUID; + sal_Int32 mnPriority; + OString maGUID; }; class XclExpIconSet : public XclExpRecord, protected XclExpRoot @@ -288,7 +288,7 @@ private: XclExpCfvoList maCfvoList; const ScIconSetFormat& mrFormat; - sal_Int32 const mnPriority; + sal_Int32 mnPriority; }; /** Contains all conditional formats of a specific sheet. */ @@ -400,8 +400,8 @@ public: virtual void Save( XclExpStream& rStrm ) override; private: - XclExpString const maDestRange; /// Destination range. - XclExpString const maUrl; /// Source document URL. + XclExpString maDestRange; /// Destination range. + XclExpString maUrl; /// Source document URL. XclExpStringRef mxQryTables; /// List of source range names. sal_Int16 mnRefresh; /// Refresh time in minutes. bool mbEntireDoc; /// true = entire document. diff --git a/sc/source/filter/inc/xedbdata.hxx b/sc/source/filter/inc/xedbdata.hxx index 7af0af6477c3..962f823084b6 100644 --- a/sc/source/filter/inc/xedbdata.hxx +++ b/sc/source/filter/inc/xedbdata.hxx @@ -37,7 +37,7 @@ protected: struct Entry { const ScDBData* mpData; - sal_Int32 const mnTableId; /// used as [n] in table[n].xml part name. + sal_Int32 mnTableId; /// used as [n] in table[n].xml part name. Entry( const ScDBData* pData, sal_Int32 nTableId ); }; diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 62660b8e1b9e..11eb5c3065ac 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -79,7 +79,7 @@ private: virtual void ImplCalcAnchorRect( const tools::Rectangle& rRect, MapUnit eMapUnit ) override; private: - SCTAB const mnScTab; /// Calc sheet index. + SCTAB mnScTab; /// Calc sheet index. }; /** Represents the position (anchor) of a shape in an embedded draw page. */ @@ -94,9 +94,9 @@ private: virtual void ImplCalcAnchorRect( const tools::Rectangle& rRect, MapUnit eMapUnit ) override; private: - Size const maPageSize; - sal_Int32 const mnScaleX; - sal_Int32 const mnScaleY; + Size maPageSize; + sal_Int32 mnScaleX; + sal_Int32 mnScaleY; }; /** Represents the position (anchor) of a note object. */ @@ -126,7 +126,7 @@ private: protected: XclEscherEx& mrEscherEx; /// Reference to the DFF converter containing the DFF stream. - sal_uInt32 const mnFragmentKey; /// The key of the DFF stream fragment to be written by this record. + sal_uInt32 mnFragmentKey; /// The key of the DFF stream fragment to be written by this record. }; /** The MSODRAWINGGROUP record contains the DGGCONTAINER with global DFF data @@ -158,8 +158,8 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - Graphic const maGraphic; /// The VCL graphic. - sal_uInt16 const mnRecId; /// Record identifier for the IMGDATA record. + Graphic maGraphic; /// The VCL graphic. + sal_uInt16 mnRecId; /// Record identifier for the IMGDATA record. }; /** Helper class for form controls to manage spreadsheet links . */ @@ -237,7 +237,7 @@ private: virtual void WriteSubRecs( XclExpStream& rStrm ) override; private: - OUString const maClassName; /// Class name of the control. + OUString maClassName; /// Class name of the control. sal_uInt32 mnStrmStart; /// Start position in 'Ctls' stream. sal_uInt32 mnStrmSize; /// Size in 'Ctls' stream. }; @@ -373,7 +373,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - SCTAB const mnTab; + SCTAB mnTab; XclExpRecordList< XclExpNote >& mrNotes; }; @@ -438,9 +438,9 @@ public: virtual XclExpDffAnchorBase* CreateDffAnchor() const override; private: - Size const maPageSize; - sal_Int32 const mnScaleX; - sal_Int32 const mnScaleY; + Size maPageSize; + sal_Int32 mnScaleX; + sal_Int32 mnScaleY; }; #endif diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index 9eff88ec3fb0..809b6ba37831 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -51,9 +51,9 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - ScColorScaleEntryType const meType; + ScColorScaleEntryType meType; OString maValue; - bool const mbFirst; + bool mbFirst; }; class XclExpExtNegativeColor @@ -63,7 +63,7 @@ public: void SaveXml( XclExpXmlStream& rStrm); private: - Color const maColor; + Color maColor; }; class XclExpExtAxisColor @@ -73,7 +73,7 @@ public: void SaveXml( XclExpXmlStream& rStrm ); private: - Color const maAxisColor; + Color maAxisColor; }; class XclExpExtIcon : public XclExpRecordBase, protected XclExpRoot @@ -95,7 +95,7 @@ public: private: OUString aFormula; - const ScCondFormatEntry mrFormat; + ScCondFormatEntry mrFormat; }; class XclExpExtDataBar : public XclExpRecordBase, protected XclExpRoot @@ -141,9 +141,9 @@ public: private: XclExpRecordRef mxEntry; - OString const maId; + OString maId; const char* pType; - sal_Int32 const mnPriority; + sal_Int32 mnPriority; const char* mOperator; }; diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 130897c425c9..107a7aee1871 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -196,7 +196,7 @@ public: private: XclExpHyperlinkRef mxLinkRec; /// Created HLINK record. - ScAddress const maScPos; /// Cell position to set at the HLINK record. + ScAddress maScPos; /// Cell position to set at the HLINK record. OUString maUrlList; /// List with all processed URLs. bool mbMultipleUrls; /// true = Multiple URL fields processed. }; diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index b7747c2e9077..6fc206078885 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -42,7 +42,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - OUString const maHdrString; /// Header or footer contents. + OUString maHdrString; /// Header or footer contents. }; // General page settings ------------------------------------------------------ @@ -83,7 +83,7 @@ private: private: const ScfUInt16Vec& mrPageBreaks; /// Page settings data of current sheet. - sal_uInt16 const mnMaxPos; /// Maximum row/column for BIFF8 page breaks. + sal_uInt16 mnMaxPos; /// Maximum row/column for BIFF8 page breaks. }; // Page settings ============================================================== diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 443d2da11ce4..261c05297d38 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -215,7 +215,7 @@ private: ScRange maOrigSrcRange; /// The original sheet source range. ScRange maExpSrcRange; /// The exported sheet source range. ScRange maDocSrcRange; /// The range used to build the cache fields and items. - sal_uInt16 const mnListIdx; /// List index in pivot cache buffer. + sal_uInt16 mnListIdx; /// List index in pivot cache buffer. bool mbValid; /// true = The cache is valid for export. }; diff --git a/sc/source/filter/inc/xepivotxml.hxx b/sc/source/filter/inc/xepivotxml.hxx index e068a7773866..4d02d30615d6 100644 --- a/sc/source/filter/inc/xepivotxml.hxx +++ b/sc/source/filter/inc/xepivotxml.hxx @@ -48,8 +48,8 @@ class XclExpXmlPivotTables : public XclExpRecordBase, protected XclExpRoot struct Entry { const ScDPObject* mpTable; - sal_Int32 const mnCacheId; - sal_Int32 const mnPivotId; /// used as [n] in pivotTable[n].xml part name. + sal_Int32 mnCacheId; + sal_Int32 mnPivotId; /// used as [n] in pivotTable[n].xml part name. Entry( const ScDPObject* pTable, sal_Int32 nCacheId, sal_Int32 nPivotId ); }; diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index e3e81a017c6a..c35a1c576ee8 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -68,7 +68,7 @@ public: virtual ~XclExpXmlElementRecord() override; protected: - sal_Int32 const mnElement; + sal_Int32 mnElement; }; class XclExpXmlStartElementRecord : public XclExpXmlElementRecord @@ -253,8 +253,8 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - bool const mbValue; /// The record data. - sal_Int32 const mnAttribute; /// The attribute to generate within SaveXml() + bool mbValue; /// The record data. + sal_Int32 mnAttribute; /// The attribute to generate within SaveXml() }; /** Record which exports a memory data array. */ @@ -290,7 +290,7 @@ public: virtual void Save( XclExpStream& rStrm ) override; private: - XclFutureRecType const meRecType; + XclFutureRecType meRecType; }; // List of records ============================================================ diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 085e23fffaec..88cf614664b4 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -344,8 +344,8 @@ private: std::stack< sax_fastparser::FSHelperPtr > maStreams; XclExpXmlPathToStateMap maOpenedStreamMap; - bool const mbExportVBA; - bool const mbExportTemplate; + bool mbExportVBA; + bool mbExportTemplate; }; #endif diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index ae960530e80c..7e6d521f5cf6 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -254,9 +254,9 @@ private: /** Stores a core number format index with corresponding Excel format index. */ struct XclExpNumFmt { - sal_uInt32 const mnScNumFmt; /// Core index of the number format. - sal_uInt16 const mnXclNumFmt; /// Resulting Excel format index. - OUString const maNumFmtString; /// format string + sal_uInt32 mnScNumFmt; /// Core index of the number format. + sal_uInt16 mnXclNumFmt; /// Resulting Excel format index. + OUString maNumFmtString; /// format string explicit XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) : mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ), maNumFmtString( rFrmt ) {} @@ -299,7 +299,7 @@ private: SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion. XclExpNumFmtVec maFormatMap; /// Maps core formats to Excel indexes. std::unique_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table. - sal_uInt32 const mnStdFmt; /// Key for standard number format. + sal_uInt32 mnStdFmt; /// Key for standard number format. sal_uInt16 mnXclOffset; /// Offset to first user defined format. }; @@ -549,10 +549,10 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - OUString const maName; /// Name of the cell style. + OUString maName; /// Name of the cell style. XclExpXFId maXFId; /// XF identifier for style formatting. sal_uInt8 mnStyleId; /// Built-in style identifier. - sal_uInt8 const mnLevel; /// Outline level for RowLevel and ColLevel styles. + sal_uInt8 mnLevel; /// Outline level for RowLevel and ColLevel styles. }; /** Stores all XF records (cell formats and cell styles) in the document. diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index de00784cc889..2c4a820014f4 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -55,7 +55,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - XclExpStringRef const mxResult; + XclExpStringRef mxResult; }; // Additional records for special formula ranges @@ -118,7 +118,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - XclTokenArrayRef const mxTokArr; /// The token array of a matrix formula. + XclTokenArrayRef mxTokArr; /// The token array of a matrix formula. }; typedef std::shared_ptr< XclExpArray > XclExpArrayRef; @@ -166,7 +166,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - XclTokenArrayRef const mxTokArr; /// The token array of a shared formula. + XclTokenArrayRef mxTokArr; /// The token array of a shared formula. sal_uInt8 mnUsedCount; /// Number of FORMULA records referring to this record. }; @@ -237,7 +237,7 @@ private: sal_uInt32 mnColInpXclRow; /// Row index of column input cell. sal_uInt16 mnRowInpXclCol; /// Column index of row input cell. sal_uInt32 mnRowInpXclRow; /// Row index of row input cell. - sal_uInt8 const mnScMode; /// Type of the multiple operation (Calc constant). + sal_uInt8 mnScMode; /// Type of the multiple operation (Calc constant). bool mbValid; /// true = Contains valid references. }; @@ -368,7 +368,7 @@ private: virtual void WriteContents( XclExpStream& rStrm ) override; private: - double const mfValue; /// The cell value. + double mfValue; /// The cell value. }; /** Represents a BOOLERR record that describes a cell with a Boolean value. */ @@ -513,8 +513,8 @@ private: private: typedef ::std::vector< XclExpMultiXFId > XclExpMultiXFIdDeq; - sal_uInt16 const mnMulRecId; /// Record ID for multiple record variant. - std::size_t const mnContSize; /// Data size of contents for one cell + sal_uInt16 mnMulRecId; /// Record ID for multiple record variant. + std::size_t mnContSize; /// Data size of contents for one cell XclExpMultiXFIdDeq maXFIds; /// The XF identifiers of the cell formatting. }; @@ -886,14 +886,14 @@ private: typedef XclExpRecordList< XclExpCellBase > XclExpCellList; XclExpCellList maCellList; /// List of cell records for this row. - sal_uInt32 const mnXclRow; /// Excel row index of this row. + sal_uInt32 mnXclRow; /// Excel row index of this row. sal_uInt16 mnHeight; /// Row height in twips. sal_uInt16 mnFlags; /// Flags for the ROW record. sal_uInt16 mnXFIndex; /// Default row formatting. sal_uInt8 mnOutlineLevel; /// Outline Level of row (for OOXML) sal_uInt32 mnXclRowRpt; sal_uInt32 mnCurrentRow; - bool const mbAlwaysEmpty; /// true = Do not add blank cells in Finalize(). + bool mbAlwaysEmpty; /// true = Do not add blank cells in Finalize(). bool mbEnabled; /// true = Write this ROW record. }; @@ -1007,7 +1007,7 @@ private: XclExpShrfmlaBuffer maShrfmlaBfr; /// Buffer for SHRFMLA records. XclExpTableopBuffer maTableopBfr; /// Buffer for TABLEOP records. XclExpDefrowhRef mxDefrowheight; /// DEFROWHEIGHT record for default row format. - XclExpRecordRef const mxGuts; /// GUTS record for outline areas. + XclExpRecordRef mxGuts; /// GUTS record for outline areas. XclExpNoteListRef mxNoteList; /// List of NOTE records. XclExpMergedcellsRef mxMergedcells; /// MERGEDCELLS record for merged cell ranges. XclExpHyperlinkRef mxHyperlinkList; /// List of HLINK records. diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index 8d320177d8d0..9e7893ecfec2 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -57,10 +57,10 @@ private: virtual void WriteBody( XclExpStream& rStrm ) override; private: - Color const maGridColor; /// Grid color (<=BIFF5). + Color maGridColor; /// Grid color (<=BIFF5). sal_uInt32 mnGridColorId; /// Color ID of grid color (>=BIFF8). sal_uInt16 mnFlags; /// Option flags. - XclAddress const maFirstXclPos; /// First visible cell. + XclAddress maFirstXclPos; /// First visible cell. sal_uInt16 mnNormalZoom; /// Zoom factor for normal view. sal_uInt16 mnPageZoom; /// Zoom factor for pagebreak preview. }; @@ -98,8 +98,8 @@ private: sal_uInt16 mnSplitX; /// Split X position, or frozen column. sal_uInt32 mnSplitY; /// Split Y position, or frozen row. XclAddress maSecondXclPos; /// First visible cell in additional panes. - sal_uInt8 const mnActivePane; /// Active pane (with cell cursor). - bool const mbFrozenPanes; /// true = "frozen" panes; false = "split" window. + sal_uInt8 mnActivePane; /// Active pane (with cell cursor). + bool mbFrozenPanes; /// true = "frozen" panes; false = "split" window. }; /** Represents a SELECTION record with selection data for a pane. */ diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 371cc72ca120..4a6b53dc8fa1 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -139,7 +139,7 @@ private: ScRangeList maRanges; /// Destination cell ranges. ScCondFmtPtr mxScCondFmt; /// Calc conditional format. - sal_uInt32 const mnFormatIndex; /// Index of this conditional format in list. + sal_uInt32 mnFormatIndex; /// Index of this conditional format in list. sal_uInt16 mnCondCount; /// Number of conditions to be inserted. sal_uInt16 mnCondIndex; /// Condition index to be inserted next. }; @@ -222,7 +222,7 @@ private: OUString maURL; /// Source document URL. OUString maTables; /// List of source range names. - ScRange const maDestRange; /// Destination range. + ScRange maDestRange; /// Destination range. XclImpWebQueryMode meMode; /// Current mode of the web query. sal_uInt16 mnRefresh; /// Refresh time in minutes. }; diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 8e1e98f759f0..c3a808490f37 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -433,7 +433,7 @@ private: typedef std::shared_ptr< XclImpChart > XclImpChartRef; XclImpChartRef mxChart; /// The chart itself (BOF/EOF substream data). - bool const mbOwnTab; /// true = own sheet; false = embedded object. + bool mbOwnTab; /// true = own sheet; false = embedded object. }; /** A note object, which is a specialized text box object. */ @@ -494,7 +494,7 @@ private: private: const XclImpRoot& mrRoot; /// Not derived from XclImpRoot to allow multiple inheritance. std::shared_ptr< ScRange > mxSrcRange; /// Source data range in the Calc document. - XclCtrlBindMode const meBindMode; /// Value binding mode. + XclCtrlBindMode meBindMode; /// Value binding mode. }; /** Base class for textbox based form controls. */ @@ -1104,7 +1104,7 @@ private: XclImpObjMapById maObjMapId; /// Maps BIFF8 drawing objects to object ID. XclImpObjTextMap maTextMap; /// Maps BIFF8 TXO textbox data to DFF stream position. ScfUInt16Vec maSkipObjs; /// IDs of all objects to be skipped. - bool const mbOleObjs; /// True = draw model supports OLE objects. + bool mbOleObjs; /// True = draw model supports OLE objects. }; /** Drawing manager of a single sheet. */ @@ -1204,7 +1204,7 @@ private: typedef std::unique_ptr<SvMemoryStream> SvMemoryStreamPtr; SvMemoryStream maDummyStrm; /// Dummy DGG stream for DFF manager. - XclImpSimpleDffConverter const maDffConv; /// DFF converter used to resolve palette colors. + XclImpSimpleDffConverter maDffConv; /// DFF converter used to resolve palette colors. SvMemoryStreamPtr mxMemStrm; /// Helper stream. }; diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index 9260e0b0d41c..658d81e195a3 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -67,7 +67,7 @@ private: SCTAB mnScTab; /// Calc sheet index of local names. ScRangeData::Type meNameType; sal_uInt16 mnXclTab; - sal_uInt16 const mnNameIndex; + sal_uInt16 mnNameIndex; bool mbVBName:1; /// true = Visual Basic procedure or function. bool mbMacro:1; /// Whether it's a user-defined macro. diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 855ff2c3219c..c752f00f8531 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -114,8 +114,8 @@ private: private: ::msfilter::MSCodec_XorXLS95 maCodec; /// Crypto algorithm implementation. css::uno::Sequence< css::beans::NamedValue > maEncryptionData; - sal_uInt16 const mnKey; - sal_uInt16 const mnHash; + sal_uInt16 mnKey; + sal_uInt16 mnHash; }; /** Decrypts BIFF8 stream contents using the given document identifier. */ diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index da72035a2c89..272de3fb483e 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -158,9 +158,9 @@ public: protected: XclTracer& mrTracer; /// Tracer for invalid addresses. - ScAddress const maMaxPos; /// Default maximum position. - sal_uInt16 const mnMaxCol; /// Maximum column index, as 16-bit value. - sal_uInt32 const mnMaxRow; /// Maximum row index. + ScAddress maMaxPos; /// Default maximum position. + sal_uInt16 mnMaxCol; /// Maximum column index, as 16-bit value. + sal_uInt32 mnMaxRow; /// Maximum row index. bool mbColTrunc; /// Flag for "columns truncated" warning box. bool mbRowTrunc; /// Flag for "rows truncated" warning box. bool mbTabTrunc; /// Flag for "tables truncated" warning box. diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index a0bda2119ac0..4dd3e434bea3 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -1139,14 +1139,14 @@ enum XclChFrameType struct XclChFormatInfo { XclChObjectType meObjType; /// Object type for automatic format. - XclChPropertyMode const mePropMode; /// Property mode for property set helper. - sal_uInt16 const mnAutoLineColorIdx; /// Automatic line color index. - sal_Int16 const mnAutoLineWeight; /// Automatic line weight (hairline, single, ...). - sal_uInt16 const mnAutoPattColorIdx; /// Automatic fill pattern color index. - XclChFrameType const meDefFrameType; /// Default format type for missing frame objects. - bool const mbCreateDefFrame; /// true = Create missing frame objects on import. - bool const mbDeleteDefFrame; /// true = Delete default frame formatting on export. - bool const mbIsFrame; /// true = Object is a frame, false = Object is a line. + XclChPropertyMode mePropMode; /// Property mode for property set helper. + sal_uInt16 mnAutoLineColorIdx; /// Automatic line color index. + sal_Int16 mnAutoLineWeight; /// Automatic line weight (hairline, single, ...). + sal_uInt16 mnAutoPattColorIdx; /// Automatic fill pattern color index. + XclChFrameType meDefFrameType; /// Default format type for missing frame objects. + bool mbCreateDefFrame; /// true = Create missing frame objects on import. + bool mbDeleteDefFrame; /// true = Delete default frame formatting on export. + bool mbIsFrame; /// true = Object is a frame, false = Object is a line. }; /** Provides access to chart auto formatting for all available object types. */ @@ -1301,8 +1301,8 @@ public: private: css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory; /// Factory to create the container. css::uno::Reference< css::container::XNameContainer > mxContainer; /// Container for the objects. - OUString const maServiceName; /// Service name to create the container. - OUString const maObjNameBase; /// Base of names for inserted objects. + OUString maServiceName; /// Service name to create the container. + OUString maObjNameBase; /// Base of names for inserted objects. sal_Int32 mnIndex; /// Index to create unique identifiers. }; @@ -1407,8 +1407,8 @@ struct XclChRootData css::uno::Reference< css::chart2::XChartDocument > mxChartDoc; /// The chart document. tools::Rectangle maChartRect; /// Position and size of the chart shape. - XclChTypeProvRef const mxTypeInfoProv; /// Provides info about chart types. - XclChFmtInfoProvRef const mxFmtInfoProv; /// Provides info about auto formatting. + XclChTypeProvRef mxTypeInfoProv; /// Provides info about chart types. + XclChFmtInfoProvRef mxFmtInfoProv; /// Provides info about auto formatting. XclChObjectTableRef mxLineDashTable; /// Container for line dash styles. XclChObjectTableRef mxGradientTable; /// Container for gradient fill styles. XclChObjectTableRef mxHatchTable; /// Container for hatch fill styles. diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index ce4a81f693b2..7dd31686a06b 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -275,9 +275,9 @@ enum XclFuncParamConv */ struct XclFuncParamInfo { - XclFuncParamValidity meValid; /// Parameter validity. - XclFuncParamConv meConv; /// Token class conversion type. - bool mbValType; /// Data type (false = REFTYPE, true = VALTYPE). + XclFuncParamValidity meValid; /// Parameter validity. + XclFuncParamConv meConv; /// Token class conversion type. + bool mbValType; /// Data type (false = REFTYPE, true = VALTYPE). }; // Function data ============================================================== @@ -310,14 +310,14 @@ const sal_uInt16 EXC_FUNCID_EXTERNCALL = 255; */ struct XclFunctionInfo { - OpCode meOpCode; /// Calc function opcode. - sal_uInt16 mnXclFunc; /// Excel function index. - sal_uInt8 const mnMinParamCount; /// Minimum number of parameters. - sal_uInt8 const mnMaxParamCount; /// Maximum number of parameters. - sal_uInt8 const mnRetClass; /// Token class of the return value. - XclFuncParamInfo const mpParamInfos[ EXC_FUNCINFO_PARAMINFO_COUNT ]; /// Information for all parameters. - sal_uInt8 const mnFlags; /// Additional flags (EXC_FUNCFLAG_* constants). - const char* mpcMacroName; /** Function name, if simulated by + OpCode meOpCode; /// Calc function opcode. + sal_uInt16 mnXclFunc; /// Excel function index. + sal_uInt8 mnMinParamCount; /// Minimum number of parameters. + sal_uInt8 mnMaxParamCount; /// Maximum number of parameters. + sal_uInt8 mnRetClass; /// Token class of the return value. + XclFuncParamInfo mpParamInfos[ EXC_FUNCINFO_PARAMINFO_COUNT ]; /// Information for all parameters. + sal_uInt8 mnFlags; /// Additional flags (EXC_FUNCFLAG_* constants). + const char* mpcMacroName; /** Function name, if simulated by a macro call (UTF-8) EXC_FUNCFLAG_ADDINEQUIV is 0; or programmatical add-in name if stored as such and @@ -411,7 +411,7 @@ public: private: ScfUInt8Vec maTokVec; /// Byte vector containing token data. ScfUInt8Vec maExtDataVec; /// Byte vector containing extended data (arrays, stacked NLRs). - bool const mbVolatile; /// True = Formula contains volatile function. + bool mbVolatile; /// True = Formula contains volatile function. }; typedef std::shared_ptr< XclTokenArray > XclTokenArrayRef; diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 2e784cef8d42..244570d770d2 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -515,7 +515,7 @@ public: protected: XclPCFieldInfo maFieldInfo; /// Pivot cache field info (SXFIELD record). XclPCFieldType meFieldType; /// Type of this pivot cache field. - sal_uInt16 const mnFieldIdx; /// Own field index in pivot cache. + sal_uInt16 mnFieldIdx; /// Own field index in pivot cache. ScfUInt16Vec maGroupOrder; /// Order of items in a grouping field (SXGROUPINFO record). XclPCNumGroupInfo maNumGroupInfo; /// Info for numeric grouping (SXNUMGROUP record). }; diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index c4bcc048c9dd..a39b89351a37 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -72,21 +72,21 @@ struct XclRootData typedef std::shared_ptr< XclTracer > XclTracerRef; typedef std::shared_ptr< RootData > RootDataRef; - XclBiff const meBiff; /// Current BIFF version. + XclBiff meBiff; /// Current BIFF version. XclOutput meOutput; /// Current Output format. SfxMedium& mrMedium; /// The medium to import from. - tools::SvRef<SotStorage> const mxRootStrg; /// The root OLE storage of imported/exported file. + tools::SvRef<SotStorage> mxRootStrg; /// The root OLE storage of imported/exported file. ScDocument& mrDoc; /// The source or destination document. OUString maDocUrl; /// Document URL of imported/exported file. OUString maBasePath; /// Base path of imported/exported file (path of maDocUrl). OUString maUserName; /// Current user name. static const OUStringLiteral gaDefPassword; /// The default password used for stream encryption. rtl_TextEncoding meTextEnc; /// Text encoding to import/export byte strings. - LanguageType const meSysLang; /// System language. + LanguageType meSysLang; /// System language. LanguageType meDocLang; /// Document language (import: from file, export: from system). LanguageType meUILang; /// UI language (import: from file, export: from system). sal_Int16 mnDefApiScript; /// Default script type for blank cells (API constant). - ScAddress const maScMaxPos; /// Highest Calc cell position. + ScAddress maScMaxPos; /// Highest Calc cell position. ScAddress maXclMaxPos; /// Highest Excel cell position. ScAddress maMaxPos; /// Highest position valid in Calc and Excel. diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 032a4a5682e4..1245d3baa0df 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -316,8 +316,8 @@ public: bool operator()( const ::oox::vml::ShapeBase& rShape ) const; private: - sal_Int32 const mnCol; - sal_Int32 const mnRow; + sal_Int32 mnCol; + sal_Int32 mnRow; }; VmlFindNoteFunc::VmlFindNoteFunc( const ScAddress& rPos ) : diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index df1557620832..8a9a3074a167 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -51,7 +51,7 @@ namespace { struct SheetCodeNameInfo { PropertySet maSheetProps; /// Property set of the sheet without codename. - OUString const maPrefix; /// Prefix for the codename to be generated. + OUString maPrefix; /// Prefix for the codename to be generated. explicit SheetCodeNameInfo( const PropertySet& rSheetProps, const OUString& rPrefix ) : maSheetProps( rSheetProps ), maPrefix( rPrefix ) {} diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 074d9032f3a6..6d8d884c767d 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -178,15 +178,15 @@ typedef std::shared_ptr< FunctionInfo > FunctionInfoRef; struct FunctionData { - const char* mpcOdfFuncName; /// ODF function name. - const char* mpcOoxFuncName; /// OOXML function name. - sal_uInt16 const mnBiff12FuncId; /// BIFF12 function identifier. - sal_uInt16 const mnBiffFuncId; /// BIFF2-BIFF8 function identifier. - sal_uInt8 const mnMinParamCount; /// Minimum number of parameters. - sal_uInt8 const mnMaxParamCount; /// Maximum number of parameters. - sal_uInt8 const mnRetClass; /// BIFF token class of the return value. - FunctionParamInfo const mpParamInfos[ FUNCINFO_PARAMINFOCOUNT ]; /// Information about all parameters. - FuncFlags const mnFlags; /// Additional flags. + const char* mpcOdfFuncName; /// ODF function name. + const char* mpcOoxFuncName; /// OOXML function name. + sal_uInt16 mnBiff12FuncId; /// BIFF12 function identifier. + sal_uInt16 mnBiffFuncId; /// BIFF2-BIFF8 function identifier. + sal_uInt8 mnMinParamCount; /// Minimum number of parameters. + sal_uInt8 mnMaxParamCount; /// Maximum number of parameters. + sal_uInt8 mnRetClass; /// BIFF token class of the return value. + FunctionParamInfo mpParamInfos[ FUNCINFO_PARAMINFOCOUNT ]; /// Information about all parameters. + FuncFlags mnFlags; /// Additional flags. bool isSupported(bool bImportFilter) const; }; diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 57a50b5d4465..8d0b620665da 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -52,9 +52,9 @@ namespace { struct BuiltinFormat { sal_Int32 mnNumFmtId; /// Built-in number format index. - const char* mpcFmtCode; /// Format string, UTF-8, may be 0 (mnPredefId is used then). - sal_Int16 const mnPredefId; /// Predefined format index, if mpcFmtCode is 0. - sal_Int32 const mnReuseId; /// Use this format, if mpcFmtCode is 0 and mnPredefId is -1. + const char* mpcFmtCode; /// Format string, UTF-8, may be 0 (mnPredefId is used then). + sal_Int16 mnPredefId; /// Predefined format index, if mpcFmtCode is 0. + sal_Int32 mnReuseId; /// Use this format, if mpcFmtCode is 0 and mnPredefId is -1. }; /** Defines a literal built-in number format. */ @@ -1853,7 +1853,7 @@ public: private: Reference< XNumberFormats > mxNumFmts; - Locale const maEnUsLocale; + Locale maEnUsLocale; }; NumberFormatFinalizer::NumberFormatFinalizer( const WorkbookHelper& rHelper ) : diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx index 6c6edf3e4a34..ffab0955b203 100644 --- a/sc/source/filter/oox/revisionfragment.cxx +++ b/sc/source/filter/oox/revisionfragment.cxx @@ -52,7 +52,7 @@ enum RevisionType */ class RCCCellValueContext : public WorkbookContextBase { - sal_Int32 const mnSheetIndex; + sal_Int32 mnSheetIndex; ScAddress& mrPos; ScCellValue& mrCellValue; sal_Int32 mnType; diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 3f2fd625b575..aa00eadf7d60 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -384,7 +384,7 @@ private: bool mbFastRowProgress; /// Do we have a progress bar thread ? ISegmentProgressBarRef mxRowProgress; /// Progress bar for row/cell processing. ISegmentProgressBarRef mxFinalProgress; /// Progress bar for finalization. - WorksheetType const meSheetType; /// Type of this sheet. + WorksheetType meSheetType; /// Type of this sheet. Reference< XSpreadsheet > mxSheet; /// Reference to the current sheet. bool mbHasDefWidth; /// True = default column width is set from defaultColWidth attribute. }; diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index f7c8a5177e04..05ff16bccfb4 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -302,7 +302,7 @@ namespace { class FindSheetByIndex { - SCTAB const mnTab; + SCTAB mnTab; public: explicit FindSheetByIndex(SCTAB nTab) : mnTab(nTab) {} bool operator() (const std::unique_ptr<ScOrcusSheet>& rSheet) const diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index d92eac3c24de..8ae35e49ebe3 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -397,8 +397,8 @@ ConvErr QProToSc::Convert( const ScDocument* pDoc, std::unique_ptr<ScTokenArray> static const struct { - DefTokenId const nToken; - QPRO_FUNC_TYPE const nType; + DefTokenId nToken; + QPRO_FUNC_TYPE nType; } aFuncMap[] = { { ocPush, FT_ConstFloat }, { ocPush, FT_Cref }, diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index 0fc08a705703..58a4a87147c4 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -37,16 +37,16 @@ struct ScMyActionInfo struct ScMyCellInfo { - ScCellValue maCell; - OUString const sFormulaAddress; - OUString const sFormula; - OUString sInputString; - double const fValue; - sal_Int32 const nMatrixCols; - sal_Int32 const nMatrixRows; - formula::FormulaGrammar::Grammar const eGrammar; - sal_uInt16 const nType; - ScMatrixMode const nMatrixFlag; + ScCellValue maCell; + OUString sFormulaAddress; + OUString sFormula; + OUString sInputString; + double fValue; + sal_Int32 nMatrixCols; + sal_Int32 nMatrixRows; + formula::FormulaGrammar::Grammar eGrammar; + sal_uInt16 nType; + ScMatrixMode nMatrixFlag; ScMyCellInfo( const ScCellValue& rCell, const OUString& sFormulaAddress, const OUString& sFormula, @@ -60,7 +60,7 @@ struct ScMyCellInfo struct ScMyDeleted { - sal_uInt32 const nID = 0; + sal_uInt32 nID = 0; std::unique_ptr<ScMyCellInfo> pCellInfo; ScMyDeleted(sal_uInt32 id, std::unique_ptr<ScMyCellInfo> p) : nID(id), pCellInfo(std::move(p)) {} @@ -68,7 +68,7 @@ struct ScMyDeleted struct ScMyGenerated { - ScBigRange const aBigRange; + ScBigRange aBigRange; sal_uInt32 nID = 0; std::unique_ptr<ScMyCellInfo> pCellInfo; @@ -78,8 +78,8 @@ struct ScMyGenerated struct ScMyInsertionCutOff { - sal_uInt32 const nID; - sal_Int32 const nPosition; + sal_uInt32 nID; + sal_Int32 nPosition; ScMyInsertionCutOff(const sal_uInt32 nTempID, const sal_Int32 nTempPosition) : nID(nTempID), nPosition(nTempPosition) {} @@ -87,9 +87,9 @@ struct ScMyInsertionCutOff struct ScMyMoveCutOff { - sal_uInt32 const nID; - sal_Int32 const nStartPosition; - sal_Int32 const nEndPosition; + sal_uInt32 nID; + sal_Int32 nStartPosition; + sal_Int32 nEndPosition; ScMyMoveCutOff(const sal_uInt32 nTempID, const sal_Int32 nStartPos, const sal_Int32 nEndPos) : nID(nTempID), nStartPosition(nStartPos), nEndPosition(nEndPos) {} @@ -113,7 +113,7 @@ struct ScMyBaseAction sal_uInt32 nActionNumber; sal_uInt32 nRejectingNumber; sal_uInt32 nPreviousAction; - ScChangeActionType const nActionType; + ScChangeActionType nActionType; ScChangeActionState nActionState; explicit ScMyBaseAction(const ScChangeActionType nActionType); diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index a265946c4d44..aded4b411a0a 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -29,7 +29,9 @@ class ScDocument; class XMLCodeNameProvider : public ::cppu::WeakImplHelper< css::container::XNameAccess > { - ScDocument* const mpDoc; + ScDocument* mpDoc; + OUString msDocName; + OUString msCodeNameProp; static bool _getCodeName( const css::uno::Any& aAny, OUString& rCodeName ); diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 5bb50f5990e2..b921af95e383 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -351,12 +351,12 @@ enum ScXMLConditionTokenType struct ScXMLConditionInfo { - ScXMLConditionToken const meToken; - ScXMLConditionTokenType const meType; - sheet::ValidationType const meValidation; - sheet::ConditionOperator const meOperator; - const char* mpcIdentifier; - sal_Int32 const mnIdentLength; + ScXMLConditionToken meToken; + ScXMLConditionTokenType meType; + sheet::ValidationType meValidation; + sheet::ConditionOperator meOperator; + const char* mpcIdentifier; + sal_Int32 mnIdentLength; }; static const ScXMLConditionInfo spConditionInfos[] = diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index 67fbab3f29b1..914343bec30e 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -95,7 +95,7 @@ public: class ScXMLDDETableContext : public ScXMLImportContext { - ScXMLDDELinkContext* const pDDELink; + ScXMLDDELinkContext* pDDELink; public: ScXMLDDETableContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index a1c69d10d746..beb206adb4da 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -75,7 +75,7 @@ public: class ScXMLDetectiveContext : public ScXMLImportContext { private: - ScMyImpDetectiveObjVec* const pDetectiveObjVec; + ScMyImpDetectiveObjVec* pDetectiveObjVec; public: ScXMLDetectiveContext( diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 937ac271db26..12bd017c5dc2 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -177,7 +177,7 @@ namespace { class WriteDatabaseRange { ScXMLExport& mrExport; - ScDocument* const mpDoc; + ScDocument* mpDoc; sal_Int32 mnCounter; ScDBCollection::RangeType meRangeType; public: diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx index 5ebd2abfbd6d..c0a49d65c448 100644 --- a/sc/source/filter/xml/XMLExportSharedData.hxx +++ b/sc/source/filter/xml/XMLExportSharedData.hxx @@ -56,7 +56,7 @@ class ScMySharedData std::unique_ptr<ScMyShapesContainer> pShapesContainer; std::unique_ptr<ScMyDetectiveObjContainer> pDetectiveObjContainer; std::unique_ptr<ScMyNoteShapesContainer> pNoteShapes; - sal_Int32 const nTableCount; + sal_Int32 nTableCount; public: explicit ScMySharedData(const sal_Int32 nTableCount); ~ScMySharedData(); diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index 45ac02b9a8fd..2d390979a5fd 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -35,8 +35,8 @@ class ScXMLImport; struct ScMyStyleNumberFormat { - OUString const sStyleName; - sal_Int32 const nNumberFormat; + OUString sStyleName; + sal_Int32 nNumberFormat; explicit ScMyStyleNumberFormat(const OUString& rStyleName) : sStyleName(rStyleName), nNumberFormat(-1) {} diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index c7537ac9f4a3..2da03d2f92e7 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -107,7 +107,7 @@ public: class ScXMLDependingsContext : public ScXMLImportContext { - ScXMLChangeTrackingImportHelper* const pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: ScXMLDependingsContext( ScXMLImport& rImport, @@ -128,7 +128,7 @@ public: class ScXMLDeletionsContext : public ScXMLImportContext { - ScXMLChangeTrackingImportHelper* const pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: ScXMLDeletionsContext( ScXMLImport& rImport, @@ -143,12 +143,12 @@ class ScXMLChangeCellContext; class ScXMLChangeTextPContext : public ScXMLImportContext { css::uno::Reference< css::xml::sax::XAttributeList> xAttrList; - OUString const sLName; + OUString sLName; OUStringBuffer sText; ScXMLChangeCellContext* pChangeCellContext; rtl::Reference<SvXMLImportContext> pTextPContext; - sal_uInt16 const nPrefix; + sal_uInt16 nPrefix; public: @@ -279,7 +279,7 @@ public: class ScXMLCutOffsContext : public ScXMLImportContext { - ScXMLChangeTrackingImportHelper* const pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; public: ScXMLCutOffsContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/cachedattraccess.hxx b/sc/source/filter/xml/cachedattraccess.hxx index a3a55fea919a..ce07299e729d 100644 --- a/sc/source/filter/xml/cachedattraccess.hxx +++ b/sc/source/filter/xml/cachedattraccess.hxx @@ -39,7 +39,7 @@ public: private: Cache maHidden; Cache maFiltered; - ScDocument* const mpDoc; + ScDocument* mpDoc; }; #endif diff --git a/sc/source/filter/xml/editattributemap.hxx b/sc/source/filter/xml/editattributemap.hxx index 9bad09d3cc95..636b38c71137 100644 --- a/sc/source/filter/xml/editattributemap.hxx +++ b/sc/source/filter/xml/editattributemap.hxx @@ -23,11 +23,11 @@ class ScXMLEditAttributeMap public: struct Entry { - sal_uInt16 const nmXMLNS; + sal_uInt16 nmXMLNS; const char* mpXMLName; const char* mpAPIName; - sal_uInt16 const mnItemID; - sal_uInt8 const mnFlag; + sal_uInt16 mnItemID; + sal_uInt8 mnFlag; }; ScXMLEditAttributeMap(); diff --git a/sc/source/filter/xml/pivotsource.hxx b/sc/source/filter/xml/pivotsource.hxx index faf0a4e06e45..e729ef44de2d 100644 --- a/sc/source/filter/xml/pivotsource.hxx +++ b/sc/source/filter/xml/pivotsource.hxx @@ -37,24 +37,24 @@ struct PivotTableSources struct SheetSource { - ScDPObject* const mpDP; - ScSheetSourceDesc const maDesc; + ScDPObject* mpDP; + ScSheetSourceDesc maDesc; SheetSource( ScDPObject* pObj, const ScSheetSourceDesc& rDesc ); }; struct DBSource { - ScDPObject* const mpDP; - ScImportSourceDesc const maDesc; + ScDPObject* mpDP; + ScImportSourceDesc maDesc; DBSource( ScDPObject* pObj, const ScImportSourceDesc& rDesc ); }; struct ServiceSource { - ScDPObject* const mpDP; - ScDPServiceDesc const maDesc; + ScDPObject* mpDP; + ScDPServiceDesc maDesc; ServiceSource( ScDPObject* pObj, const ScDPServiceDesc& rDesc ); }; diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index f1ce2e1b6bd6..85a951535b51 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -85,7 +85,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext sal_Int16 nCellType; bool bIsMerged; bool bIsMatrix; - bool const bIsCovered; + bool bIsCovered; bool bIsEmpty; bool mbNewValueType; bool mbErrorValue; diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 949fc3a16a36..bc401698eee6 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -49,8 +49,8 @@ class ScXMLTableColsContext : public ScXMLImportContext sal_Int32 nHeaderEndCol; sal_Int32 nGroupStartCol; sal_Int32 nGroupEndCol; - bool const bHeader; - bool const bGroup; + bool bHeader; + bool bGroup; bool bGroupDisplay; public: diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 9df9caad5fec..ffa9a011cac0 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -101,7 +101,7 @@ public: private: ScDataBarFormatData* mpFormatData; - ScConditionalFormat* const mpParent; + ScConditionalFormat* mpParent; sal_Int32 mnIndex; }; @@ -109,7 +109,7 @@ private: class ScXMLIconSetFormatContext : public ScXMLImportContext { ScIconSetFormatData* mpFormatData; - ScConditionalFormat* const mpParent; + ScConditionalFormat* mpParent; public: ScXMLIconSetFormatContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 31bd37690efb..4c95b93f0b9a 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -379,7 +379,7 @@ public: class ScXMLDataPilotMembersContext : public ScXMLImportContext { - ScXMLDataPilotFieldContext* const pDataPilotField; + ScXMLDataPilotFieldContext* pDataPilotField; public: diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 07db8dfcba9e..076253b2f117 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -36,7 +36,7 @@ class ScXMLFilterContext : public ScXMLImportContext { struct ConnStackItem { - bool const mbOr; + bool mbOr; int mnCondCount; explicit ConnStackItem(bool bOr); }; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 9393ca990797..05e0100e0147 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1511,7 +1511,7 @@ namespace { class RangeNameInserter { - ScDocument* const mpDoc; + ScDocument* mpDoc; ScRangeName& mrRangeName; public: diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 48b6dd93966a..bf010b26a81e 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -186,9 +186,9 @@ typedef ::std::list<std::unique_ptr<ScMyNamedExpression>> ScMyNamedExpressions; struct ScMyLabelRange { - OUString const sLabelRangeStr; - OUString const sDataRangeStr; - bool const bColumnOrientation; + OUString sLabelRangeStr; + OUString sDataRangeStr; + bool bColumnOrientation; }; typedef std::list< std::unique_ptr<const ScMyLabelRange> > ScMyLabelRanges; diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index e47e72048dbc..7dc5f138e24f 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -64,7 +64,7 @@ public: virtual void insert(ScMyNamedExpression* pExp) override; private: ScXMLImport& mrImport; - SCTAB const mnTab; + SCTAB mnTab; }; ScXMLNamedExpressionsContext( diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 582e7158f09c..2debb5090d43 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -50,8 +50,8 @@ class ScXMLTableRowsContext : public ScXMLImportContext { SCROW nHeaderStartRow; SCROW nGroupStartRow; - bool const bHeader; - bool const bGroup; + bool bHeader; + bool bGroup; bool bGroupDisplay; public: diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 1bbb01ee145c..78bab6fdeee2 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -126,7 +126,7 @@ class XMLTableStylesContext : public SvXMLStylesContext sal_Int32 nConditionalFormatIndex; sal_Int32 nCellStyleIndex; sal_Int32 nMasterPageNameIndex; - bool const bAutoStyles; + bool bAutoStyles; rtl::Reference < SvXMLImportPropertyMapper > xCellImpPropMapper; rtl::Reference < SvXMLImportPropertyMapper > xColumnImpPropMapper; diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 9601a8637a3b..d2ae0c88ec4d 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -265,7 +265,7 @@ private: mutable sal_uInt32 mnShapesSelected; ScTabViewShell* mpViewShell; ScAccessibleDocument* mpAccessibleDocument; - ScSplitPos const meSplitPos; + ScSplitPos meSplitPos; void FillShapes(std::vector < uno::Reference < drawing::XShape > >& rShapes) const; bool FindSelectedShapesChanges(const css::uno::Reference<css::drawing::XShapes>& xShapes) const; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index f27e98f5742c..aacee4d694cc 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -98,7 +98,7 @@ public: private: ScPreviewShell* mpViewShell; - ScAccessibleDocumentPagePreview* const mpAccDoc; + ScAccessibleDocumentPagePreview* mpAccDoc; typedef std::vector<ScAccNote> ScAccNotes; mutable ScAccNotes maNotes; mutable ScAccNotes maMarks; @@ -269,7 +269,7 @@ namespace { struct ScPointFound { - tools::Rectangle const maPoint; + tools::Rectangle maPoint; sal_Int32 mnParagraphs; explicit ScPointFound(const Point& rPoint) : maPoint(rPoint, Size(0, 0)), mnParagraphs(0) {} bool operator() (const ScAccNote& rNote) @@ -431,7 +431,7 @@ namespace { struct ScChildGone { - ScAccessibleDocumentPagePreview* const mpAccDoc; + ScAccessibleDocumentPagePreview* mpAccDoc; explicit ScChildGone(ScAccessibleDocumentPagePreview* pAccDoc) : mpAccDoc(pAccDoc) {} void operator() (const uno::Reference<XAccessible>& xAccessible) const { @@ -449,7 +449,7 @@ struct ScChildGone struct ScChildNew { - ScAccessibleDocumentPagePreview* const mpAccDoc; + ScAccessibleDocumentPagePreview* mpAccDoc; explicit ScChildNew(ScAccessibleDocumentPagePreview* pAccDoc) : mpAccDoc(pAccDoc) {} void operator() (const uno::Reference<XAccessible>& xAccessible) const { @@ -675,7 +675,7 @@ public: void VisAreaChanged() const; private: - ScAccessibleDocumentPagePreview* const mpAccDoc; + ScAccessibleDocumentPagePreview* mpAccDoc; ScPreviewShell* mpViewShell; ScShapeRangeVec maShapeRanges; @@ -913,7 +913,7 @@ namespace { struct ScShapePointFound { - Point const maPoint; + Point maPoint; explicit ScShapePointFound(const awt::Point& rPoint) : maPoint(VCLPoint(rPoint)) {} bool operator() (const ScShapeChild& rShape) { diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index 70202f93170f..3a3ee75f8569 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -65,7 +65,7 @@ public: } private: Reference<XAccessibleEventListener> mxListener; - bool const mbAdd; + bool mbAdd; }; } diff --git a/sc/source/ui/dataprovider/htmldataprovider.cxx b/sc/source/ui/dataprovider/htmldataprovider.cxx index 39a30c8754b9..fbd1daaa3271 100644 --- a/sc/source/ui/dataprovider/htmldataprovider.cxx +++ b/sc/source/ui/dataprovider/htmldataprovider.cxx @@ -26,10 +26,10 @@ namespace sc { class HTMLFetchThread : public salhelper::Thread { ScDocument& mrDocument; - OUString const maURL; - OUString const maID; + OUString maURL; + OUString maID; const std::vector<std::shared_ptr<sc::DataTransformation>> maDataTransformations; - std::function<void()> const maImportFinishedHdl; + std::function<void()> maImportFinishedHdl; void handleTable(xmlNodePtr pTable); void handleRow(xmlNodePtr pRow, SCROW nRow); diff --git a/sc/source/ui/dataprovider/htmldataprovider.hxx b/sc/source/ui/dataprovider/htmldataprovider.hxx index b3ac0c488c4e..6a74eb3d9801 100644 --- a/sc/source/ui/dataprovider/htmldataprovider.hxx +++ b/sc/source/ui/dataprovider/htmldataprovider.hxx @@ -20,7 +20,7 @@ class HTMLDataProvider : public DataProvider { private: - ScDocument* const mpDocument; + ScDocument* mpDocument; rtl::Reference<HTMLFetchThread> mxHTMLFetchThread; ScDocumentUniquePtr mpDoc; diff --git a/sc/source/ui/dataprovider/xmldataprovider.cxx b/sc/source/ui/dataprovider/xmldataprovider.cxx index da0f9bd28535..d540f81c5dc9 100644 --- a/sc/source/ui/dataprovider/xmldataprovider.cxx +++ b/sc/source/ui/dataprovider/xmldataprovider.cxx @@ -24,12 +24,12 @@ namespace sc class XMLFetchThread : public salhelper::Thread { ScDocument& mrDocument; - OUString const maURL; - OUString const maID; + OUString maURL; + OUString maID; ScOrcusImportXMLParam maParam; std::unique_ptr<ScOrcusXMLContext> mpXMLContext; const std::vector<std::shared_ptr<sc::DataTransformation>> maDataTransformations; - std::function<void()> const maImportFinishedHdl; + std::function<void()> maImportFinishedHdl; public: XMLFetchThread(ScDocument& rDoc, const OUString&, const ScOrcusImportXMLParam& rParam, diff --git a/sc/source/ui/dataprovider/xmldataprovider.hxx b/sc/source/ui/dataprovider/xmldataprovider.hxx index 87b30a1ecea9..46bf69571494 100644 --- a/sc/source/ui/dataprovider/xmldataprovider.hxx +++ b/sc/source/ui/dataprovider/xmldataprovider.hxx @@ -19,7 +19,7 @@ class XMLFetchThread; class XMLDataProvider : public DataProvider { private: - ScDocument* const mpDocument; + ScDocument* mpDocument; rtl::Reference<XMLFetchThread> mxXMLFetchThread; ScDocumentUniquePtr mpDoc; diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index f4e4698fee1b..c69b35ac9a1e 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -53,7 +53,7 @@ namespace { struct Func_SetType { - sal_Int32 const mnType; + sal_Int32 mnType; explicit Func_SetType( sal_Int32 nType ) : mnType( nType ) {} void operator()( ScCsvColState& rState ) const { rState.mnType = mnType; } @@ -61,7 +61,7 @@ struct Func_SetType struct Func_Select { - bool const mbSelect; + bool mbSelect; explicit Func_Select( bool bSelect ) : mbSelect( bSelect ) {} void operator()( ScCsvColState& rState ) const { rState.Select( mbSelect ); } diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 774ea045ae21..24c9bade1c50 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -33,7 +33,7 @@ namespace { class FindByRange { - ScRange const maRange; + ScRange maRange; public: explicit FindByRange(const ScRange& r) : maRange(r) {} bool operator() (const ScAutoStyleData& rData) const { return rData.aRange == maRange; } @@ -41,7 +41,7 @@ public: class FindByTimeout { - sal_uLong const mnTimeout; + sal_uLong mnTimeout; public: explicit FindByTimeout(sal_uLong n) : mnTimeout(n) {} bool operator() (const ScAutoStyleData& rData) const { return rData.nTimeout >= mnTimeout; } diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 3e3c46b86140..1a9e0a0c197b 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -53,7 +53,7 @@ double getNow() class CSVHandler { DataStream::Line& mrLine; - size_t const mnColCount; + size_t mnColCount; size_t mnCols; const char* mpLineHead; @@ -95,7 +95,7 @@ namespace datastreams { class ReaderThread : public salhelper::Thread { std::unique_ptr<SvStream> mpStream; - size_t const mnColCount; + size_t mnColCount; bool mbTerminate; osl::Mutex maMtxTerminate; diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index d36c2f6f606e..7217177a1bf4 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1103,8 +1103,8 @@ void ScDocFunc::NotifyInputHandler( const ScAddress& rPos ) struct ScMyRememberItem { - sal_Int32 const nIndex; - SfxItemSet const aItemSet; + sal_Int32 nIndex; + SfxItemSet aItemSet; ScMyRememberItem(const SfxItemSet& rItemSet, sal_Int32 nTempIndex) : nIndex(nTempIndex), aItemSet(rItemSet) {} diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index cb3467c8bb69..1796b02b5434 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -35,7 +35,7 @@ namespace sc { struct DocumentLinkManagerImpl { - SfxObjectShell* const mpShell; + SfxObjectShell* mpShell; std::unique_ptr<DataStream, o3tl::default_delete<DataStream>> mpDataStream; std::atomic<sfx2::LinkManager*> mpLinkManager; diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 38d449771318..778d339aa4fb 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -95,7 +95,7 @@ public: } private: - OUString const maSearchName; + OUString maSearchName; }; class FindSrcFileByName @@ -126,8 +126,8 @@ public: p->notify(mnFileId, meType); } private: - sal_uInt16 const mnFileId; - ScExternalRefManager::LinkUpdateType const meType; + sal_uInt16 mnFileId; + ScExternalRefManager::LinkUpdateType meType; }; struct UpdateFormulaCell @@ -163,7 +163,7 @@ public: r.second.erase(mpCell); } private: - ScFormulaCell* const mpCell; + ScFormulaCell* mpCell; }; class ConvertFormulaToStatic @@ -2806,7 +2806,7 @@ class RefCacheFiller : public sc::ColumnSpanSet::ColumnAction ScExternalRefCache& mrRefCache; ScExternalRefCache::TableTypeRef mpRefTab; - sal_uInt16 const mnFileId; + sal_uInt16 mnFileId; ScColumn* mpCurCol; sc::ColumnBlockConstPosition maBlockPos; diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx index 5e40f6e075ec..fbb8ce65a361 100644 --- a/sc/source/ui/inc/AccessibilityHints.hxx +++ b/sc/source/ui/inc/AccessibilityHints.hxx @@ -37,7 +37,7 @@ public: class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint { - ScSplitPos const eOldGridWin; + ScSplitPos eOldGridWin; public: ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin ); virtual ~ScAccGridWinFocusLostHint() override; @@ -47,7 +47,7 @@ public: class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint { - ScSplitPos const eNewGridWin; + ScSplitPos eNewGridWin; public: ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin ); virtual ~ScAccGridWinFocusGotHint() override; diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 401fec77ea2b..2fb00ee47844 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -113,7 +113,7 @@ protected: ScDocument* mpDoc; - sal_Int32 const mnIndex; + sal_Int32 mnIndex; private: virtual bool IsEditable( diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 7c29cb2274bf..670f3add4d5b 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -281,7 +281,7 @@ private: /** This is the role of this object. */ - sal_Int16 const maRole; + sal_Int16 maRole; }; #endif diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 58e9035c88b1..68623b33936a 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -438,9 +438,9 @@ protected: private: OUString maCellText; /// The text contents of this cell. - sal_Int32 const mnLine; /// The grid line index (core index). - sal_uInt32 const mnColumn; /// The grid column index (core index). - sal_Int32 const mnIndex; /// The index of the cell in the table. + sal_Int32 mnLine; /// The grid line index (core index). + sal_uInt32 mnColumn; /// The grid column index (core index). + sal_Int32 mnIndex; /// The index of the cell in the table. public: explicit ScAccessibleCsvCell( diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 2cf9db6a5c89..d908d952ffb4 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -227,7 +227,7 @@ protected: private: ScTabViewShell* mpViewShell; - ScSplitPos const meSplitPos; + ScSplitPos meSplitPos; rtl::Reference<ScAccessibleSpreadsheet> mpAccessibleSpreadsheet; std::unique_ptr<ScChildrenShapes> mpChildrenShapes; ScAccessibleEditObject* mpTempAccEdit; diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 52155f477470..aee06efb3380 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -174,7 +174,7 @@ private: std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper; EditView* mpEditView; VclPtr<vcl::Window> mpWindow; - EditObjectType const meObjectType; + EditObjectType meObjectType; bool mbHasFocus; bool IsDefunc( diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index 7207ee516d42..82262186e82d 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -76,8 +76,8 @@ protected: private: ScPreviewShell* mpViewShell; - sal_Int32 const mnIndex; - bool const mbHeader; + sal_Int32 mnIndex; + bool mbHeader; std::vector< rtl::Reference<ScAccessiblePageHeaderArea> > maAreas; sal_Int32 mnChildCount; diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index e50ecec497f9..7af796fb6563 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -114,7 +114,7 @@ protected: private: ScPreviewShell* mpViewShell; accessibility::AccessibleTextHelper* mpTextHelper; - sal_Int32 const mnIndex; + sal_Int32 mnIndex; ScAddress maCellPos; bool mbColumnHeader; bool mbRowHeader; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 212f0244f5b5..54d7b92f8190 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -123,7 +123,7 @@ protected: private: ScPreviewShell* mpViewShell; - sal_Int32 const mnIndex; + sal_Int32 mnIndex; mutable std::unique_ptr<ScPreviewTableInfo> mpTableInfo; bool IsDefunc( diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index b812d53517c1..f2ecf98429de 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -250,7 +250,7 @@ private: ScSplitPos meSplitPos; ScAddress maActiveCell; SCTAB mnTab; - bool const mbIsSpreadsheet; + bool mbIsSpreadsheet; bool mbDelIns; bool mbIsFocusSend; typedef std::map<ScMyAddress,css::uno::Reference< css::accessibility::XAccessible > > diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 895eac8913fb..067057f106c3 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -225,7 +225,7 @@ public: protected: /// contains the range of the table, because it could be a subrange of the complete table - ScRange const maRange; + ScRange maRange; ScDocument* mpDoc; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 0bcb2b5a6f3f..974d4c089117 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -92,7 +92,7 @@ public: private: std::unique_ptr<ScViewForwarder> mpViewForwarder; ScTabViewShell* mpViewShell; - ScSplitPos const meSplitPos; + ScSplitPos meSplitPos; ScAccessibleCell* mpAccessibleCell; using ScAccessibleCellBaseTextData::GetDocShell; @@ -189,9 +189,9 @@ public: private: std::unique_ptr<ScPreviewViewForwarder> mpViewForwarder; ScPreviewShell* mpViewShell; - OUString const maText; - bool const mbColHeader; - bool const mbRowHeader; + OUString maText; + bool mbColHeader; + bool mbRowHeader; using ScAccessibleCellBaseTextData::GetDocShell; static ScDocShell* GetDocShell(ScPreviewShell* pViewShell); @@ -221,7 +221,7 @@ private: ScDocShell* mpDocSh; const EditTextObject* mpEditObj; bool mbDataValid; - SvxAdjust const meAdjust; + SvxAdjust meAdjust; }; class ScAccessibleNoteTextData : public ScAccessibleTextData @@ -246,9 +246,9 @@ private: std::unique_ptr<ScEditEngineDefaulter> mpEditEngine; std::unique_ptr<SvxEditEngineForwarder> mpForwarder; ScDocShell* mpDocSh; - OUString const msText; - ScAddress const maCellPos; - bool const mbMarkNote; + OUString msText; + ScAddress maCellPos; + bool mbMarkNote; bool mbDataValid; }; @@ -262,8 +262,8 @@ private: EditEngine* mpEditEngine; TextForwarderPtr mpTextForwarder; ViewForwarderPtr mpViewForwarder; - OUString const maCellText; - Size const maCellSize; + OUString maCellText; + Size maCellSize; public: explicit ScAccessibleCsvTextData( diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index a01a8de02dff..99f72727341e 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -22,7 +22,7 @@ class ScItemValue final { public: - OUString const maName; + OUString maName; ScPivotFuncData maFunctionData; ScItemValue* mpOriginalItemValue; @@ -43,9 +43,9 @@ private: ScViewData* mpViewData; ScDocument& mrDocument; - bool const mbNewPivotTable; + bool mbNewPivotTable; - ScAddress::Details const maAddressDetails; + ScAddress::Details maAddressDetails; bool mbDialogLostFocus; formula::RefEdit* mpActiveEdit; diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 32b26505db12..4e6607f9ca6a 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -34,7 +34,7 @@ public: private: // Data - ScViewData* const mpViewData; + ScViewData* mpViewData; const ScDocument& mrDoc; ScRange maInputRange; diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index f71c7bb87e25..29aaa8087092 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -32,14 +32,14 @@ private: formula::RefEdit* mpActiveEdit; // Data - ScViewData* const mViewData; + ScViewData* mViewData; const ScDocument& mDocument; - ScRange mInputRange; - ScAddress::Details const mAddressDetails; - ScAddress mOutputAddress; + ScRange mInputRange; + ScAddress::Details mAddressDetails; + ScAddress mOutputAddress; - ScAddress const mCurrentAddress; + ScAddress mCurrentAddress; sal_Int64 mnLastSampleSizeValue; sal_Int64 mnLastPeriodValue; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 69fd05bf92de..a3be27b1aa32 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -55,13 +55,13 @@ protected: std::unique_ptr<weld::RadioButton> mxGroupByRowsRadio; // Data - ScViewData* const mViewData; - ScDocument& mDocument; + ScViewData* mViewData; + ScDocument& mDocument; - ScRange mInputRange; - ScAddress::Details const mAddressDetails; - ScAddress mOutputAddress; - GroupedBy mGroupedBy; + ScRange mInputRange; + ScAddress::Details mAddressDetails; + ScAddress mOutputAddress; + GroupedBy mGroupedBy; static ScRangeList MakeColumnRangeList(SCTAB aTab, ScAddress const & aStart, ScAddress const & aEnd); static ScRangeList MakeRowRangeList(SCTAB aTab, ScAddress const & aStart, ScAddress const & aEnd); @@ -71,8 +71,8 @@ private: std::unique_ptr<weld::Button> mxButtonOk; formula::RefEdit* mpActiveEdit; - ScAddress const mCurrentAddress; - bool mDialogLostFocus; + ScAddress mCurrentAddress; + bool mDialogLostFocus; void Init(); void GetRangeFromSelection(); diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 83379cd5ebdb..8b870642e7b8 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -55,7 +55,7 @@ protected: std::unique_ptr<formula::RefButton> mxOutputRangeButton; // Data - ScViewData* const mViewData; + ScViewData* mViewData; ScDocument& mDocument; ScRange mVariable1Range; @@ -73,8 +73,8 @@ private: std::unique_ptr<weld::RadioButton> mxGroupByRowsRadio; formula::RefEdit* mpActiveEdit; - ScAddress const mCurrentAddress; - bool mDialogLostFocus; + ScAddress mCurrentAddress; + bool mDialogLostFocus; void Init(); void GetRangeFromSelection(); diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index 1ccfaf43962b..9d4e82956a66 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -20,7 +20,7 @@ class FormulaTemplate { private: OUString mTemplate; - ScDocument* const mpDoc; + ScDocument* mpDoc; bool mbUse3D; typedef std::map<OUString, ScRange> RangeReplacementMap; @@ -53,7 +53,7 @@ public: std::vector<ScAddress> mAddressStack; ScAddress mCurrentAddress; - ScAddress const mMinimumAddress; + ScAddress mMinimumAddress; ScAddress mMaximumAddress; AddressWalker(const ScAddress& aInitialAddress); @@ -74,7 +74,7 @@ class AddressWalkerWriter : public AddressWalker public: ScDocShell* mpDocShell; ScDocument* mpDocument; - formula::FormulaGrammar::Grammar const meGrammar; + formula::FormulaGrammar::Grammar meGrammar; AddressWalkerWriter(const ScAddress& aInitialAddress, ScDocShell* pDocShell, ScDocument* pDocument, formula::FormulaGrammar::Grammar eGrammar ); @@ -91,8 +91,8 @@ public: class DataCellIterator final { private: - ScRange const mInputRange; - bool const mByColumn; + ScRange mInputRange; + bool mByColumn; SCCOL mCol; SCROW mRow; @@ -109,7 +109,7 @@ public: class DataRangeIterator { protected: - ScRange const mInputRange; + ScRange mInputRange; sal_Int32 mIndex; public: diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index e1bec8acdd18..a8d18b18507b 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -61,13 +61,13 @@ class ScAcceptChgDlg final : public SfxModelessDialogController OUString aStrMove; OUString aStrContent; OUString aStrReject; - OUString const aStrAllAccepted; - OUString const aStrAllRejected; - OUString const aStrNoEntry; - OUString const aStrContentWithChild; - OUString const aStrChildContent; - OUString const aStrChildOrgContent; - OUString const aStrEmpty; + OUString aStrAllAccepted; + OUString aStrAllRejected; + OUString aStrNoEntry; + OUString aStrContentWithChild; + OUString aStrChildContent; + OUString aStrChildOrgContent; + OUString aStrEmpty; OUString aUnknown; sal_uLong nAcceptCount; sal_uLong nRejectCount; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 2ee83f4c8573..699725f712c1 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -41,7 +41,7 @@ class ScFormulaReferenceHelper formula::RefEdit* m_pRefEdit; // active input field formula::RefButton* m_pRefBtn; // associated button weld::Dialog* m_pDialog; - SfxBindings* const m_pBindings; + SfxBindings* m_pBindings; SCTAB m_nRefTab; // used for ShowReference OUString m_sOldDialogText; // Original title of the dialog window @@ -89,7 +89,7 @@ class ScRefHandler : public IAnyRefDialog private: ScFormulaReferenceHelper m_aHelper; - SfxBindings* const m_pMyBindings; + SfxBindings* m_pMyBindings; OUString m_aDocName; // document on which the dialog was opened diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index 817832cce920..345331c44272 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -31,12 +31,12 @@ class ScAreaLink; class ScAreaLinkSaver { private: - OUString const aFileName; - OUString const aFilterName; - OUString const aOptions; - OUString const aSourceArea; - ScRange const aDestArea; - sal_uLong const nRefresh; + OUString aFileName; + OUString aFilterName; + OUString aOptions; + OUString aSourceArea; + ScRange aDestArea; + sal_uLong nRefresh; public: ScAreaLinkSaver( const ScAreaLink& rSource ); diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index 5ffec7d0e0ad..83078c378aa2 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -40,10 +40,10 @@ struct ScAutoStyleData }; struct ScAutoStyleInitData { - ScRange const aRange; - OUString const aStyle1; - sal_uLong const nTimeout; - OUString const aStyle2; + ScRange aRange; + OUString aStyle1; + sal_uLong nTimeout; + OUString aStyle2; ScAutoStyleInitData( const ScRange& rR, const OUString& rSt1, sal_uLong nT, const OUString& rSt2 ) : aRange(rR), aStyle1(rSt1), nTimeout(nT), aStyle2(rSt2) {} diff --git a/sc/source/ui/inc/cellmergeoption.hxx b/sc/source/ui/inc/cellmergeoption.hxx index f66957ac23ac..ff4a7cbebcc9 100644 --- a/sc/source/ui/inc/cellmergeoption.hxx +++ b/sc/source/ui/inc/cellmergeoption.hxx @@ -21,7 +21,7 @@ struct ScCellMergeOption SCROW mnStartRow; SCCOL mnEndCol; SCROW mnEndRow; - bool const mbCenter; + bool mbCenter; explicit ScCellMergeOption(const ScRange& rRange); explicit ScCellMergeOption(SCCOL nStartCol, SCROW nStartRow, diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 2c243c756f54..13aac159618f 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -24,8 +24,8 @@ private: OUString maStrWarnSameValue; SvNumberFormatter* mpNumberFormatter; - ScDocument* const mpDoc; - ScAddress const maPos; + ScDocument* mpDoc; + ScAddress maPos; std::unique_ptr<weld::Button> mxBtnOk; std::unique_ptr<weld::Button> mxBtnCancel; diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index d231dda5f08a..bfbb5cb7bb58 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -29,7 +29,7 @@ class ScTabView; class ScColBar : public ScHeaderControl { - ScHSplitPos const meWhich; + ScHSplitPos meWhich; ScHeaderFunctionSet* mpFuncSet; public: @@ -59,7 +59,7 @@ public: class ScRowBar : public ScHeaderControl { - ScVSplitPos const meWhich; + ScVSplitPos meWhich; ScHeaderFunctionSet* mpFuncSet; public: diff --git a/sc/source/ui/inc/condformatdlgitem.hxx b/sc/source/ui/inc/condformatdlgitem.hxx index 52c4f4ddc944..27df99ef9b54 100644 --- a/sc/source/ui/inc/condformatdlgitem.hxx +++ b/sc/source/ui/inc/condformatdlgitem.hxx @@ -61,9 +61,9 @@ public: private: std::shared_ptr<ScConditionalFormatList> mpCondFormats; - sal_Int32 const mnItem; + sal_Int32 mnItem; condformat::dialog::ScCondFormatDialogType meDialogType; - bool const mbManaged; + bool mbManaged; }; #endif diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 02e904b3c255..f24f57952a33 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -25,7 +25,7 @@ private: void setColSizes(); weld::TreeView& mrTreeView; - ScDocument* const mpDoc; + ScDocument* mpDoc; ScConditionalFormatList* mpFormatList; public: diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx index 0c7fc699ab00..ac34f0a68a0b 100644 --- a/sc/source/ui/inc/condformatuno.hxx +++ b/sc/source/ui/inc/condformatuno.hxx @@ -69,7 +69,7 @@ public: ScConditionalFormatList* getCoreObject(); private: - SCTAB const mnTab; + SCTAB mnTab; ScDocShell* mpDocShell; }; @@ -119,8 +119,8 @@ public: private: rtl::Reference<ScCondFormatsObj> mxCondFormatList; ScDocShell* mpDocShell; - SfxItemPropertySet const maPropSet; - sal_Int32 const mnKey; + SfxItemPropertySet maPropSet; + sal_Int32 mnKey; }; class ScConditionEntryObj : public cppu::WeakImplHelper<css::beans::XPropertySet, @@ -156,7 +156,7 @@ public: private: ScDocShell* mpDocShell; rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet const maPropSet; + SfxItemPropertySet maPropSet; const ScCondFormatEntry* mpFormat; }; @@ -192,7 +192,7 @@ public: private: rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet const maPropSet; + SfxItemPropertySet maPropSet; const ScColorScaleFormat* mpFormat; }; @@ -219,7 +219,7 @@ private: ScColorScaleEntry* getCoreObject(); rtl::Reference<ScColorScaleFormatObj> mxParent; - size_t const mnPos; + size_t mnPos; }; class ScDataBarFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, @@ -253,7 +253,7 @@ public: private: rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet const maPropSet; + SfxItemPropertySet maPropSet; const ScDataBarFormat* mpFormat; }; @@ -276,7 +276,7 @@ private: ScColorScaleEntry* getCoreObject(); rtl::Reference<ScDataBarFormatObj> mxParent; - size_t const mnPos; + size_t mnPos; }; class ScIconSetFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, @@ -310,7 +310,7 @@ public: private: rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet const maPropSet; + SfxItemPropertySet maPropSet; const ScIconSetFormat* mpFormat; }; @@ -333,7 +333,7 @@ private: ScColorScaleEntry* getCoreObject(); rtl::Reference<ScIconSetFormatObj> mxParent; - size_t const mnPos; + size_t mnPos; }; class ScCondDateFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, @@ -368,7 +368,7 @@ public: private: rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet const maPropSet; + SfxItemPropertySet maPropSet; const ScCondDateFormatEntry* mpFormat; }; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 8be5550add19..e8797a90b488 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -70,11 +70,11 @@ public: class ScConflictsFinder final { private: - ScChangeTrack* const mpTrack; - sal_uLong const mnStartShared; - sal_uLong const mnEndShared; - sal_uLong const mnStartOwn; - sal_uLong const mnEndOwn; + ScChangeTrack* mpTrack; + sal_uLong mnStartShared; + sal_uLong mnEndShared; + sal_uLong mnStartOwn; + sal_uLong mnEndOwn; ScConflictsList& mrConflictsList; static bool DoActionsIntersect( const ScChangeAction* pAction1, const ScChangeAction* pAction2 ); @@ -108,7 +108,7 @@ public: class ScConflictsDlg : public weld::GenericDialogController { private: - OUString const maStrUnknownUser; + OUString maStrUnknownUser; ScViewData* const mpViewData; ScDocument* mpOwnDoc; diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 92851019fbad..098c1424243a 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -44,14 +44,14 @@ public: virtual void Deactivate() override; private: - OUString const aStrUndefined; + OUString aStrUndefined; - ScConsolidateParam const theConsData; + ScConsolidateParam theConsData; ScViewData& rViewData; - ScDocument* const pDoc; + ScDocument* pDoc; std::unique_ptr<ScAreaData[]> pAreaData; size_t nAreaDataCount; - sal_uInt16 const nWhichCons; + sal_uInt16 nWhichCons; bool bDlgLostFocus; formula::RefEdit* m_pRefInputEdit; diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index ab705a287426..bfca95248a0b 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -50,7 +50,7 @@ private: typedef std::unordered_map< OUString, ScRange > NameRangeMap; NameRangeMap aRangeMap; - ScViewData* const pViewData; + ScViewData* pViewData; ScDocument* pDoc; bool bDlgLostFocus; diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 4c95c7a77286..ca7595415122 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -135,7 +135,7 @@ struct ScCsvLayoutData sal_Int32 mnColCursor; /// Position of grid column cursor. mutable sal_Int32 mnNoRepaint; /// >0 = no repaint. - bool const mbAppRTL; /// true = application in RTL mode. + bool mbAppRTL; /// true = application in RTL mode. explicit ScCsvLayoutData(); diff --git a/sc/source/ui/inc/dataprovider.hxx b/sc/source/ui/inc/dataprovider.hxx index 4e15b2c643ba..a7a5f9b10d42 100644 --- a/sc/source/ui/inc/dataprovider.hxx +++ b/sc/source/ui/inc/dataprovider.hxx @@ -35,7 +35,7 @@ class ExternalDataSource; class CSVFetchThread : public salhelper::Thread { ScDocument& mrDocument; - OUString const maURL; + OUString maURL; bool mbTerminate; osl::Mutex maMtxTerminate; @@ -44,7 +44,7 @@ class CSVFetchThread : public salhelper::Thread std::vector<std::shared_ptr<sc::DataTransformation>> maDataTransformations; - std::function<void()> const maImportFinishedHdl; + std::function<void()> maImportFinishedHdl; public: @@ -90,7 +90,7 @@ public: class CSVDataProvider : public DataProvider { rtl::Reference<CSVFetchThread> mxCSVFetchThread; - ScDocument* const mpDocument; + ScDocument* mpDocument; ScDocumentUniquePtr mpDoc; void Refresh(); diff --git a/sc/source/ui/inc/datatransformation.hxx b/sc/source/ui/inc/datatransformation.hxx index b99d2c10c7cb..55055821ab54 100644 --- a/sc/source/ui/inc/datatransformation.hxx +++ b/sc/source/ui/inc/datatransformation.hxx @@ -62,7 +62,7 @@ public: class SC_DLLPUBLIC ColumnRemoveTransformation : public DataTransformation { - std::set<SCCOL> const maColumns; + std::set<SCCOL> maColumns; public: @@ -75,8 +75,8 @@ public: class SC_DLLPUBLIC SplitColumnTransformation : public DataTransformation { - SCCOL const mnCol; - sal_Unicode const mcSeparator; + SCCOL mnCol; + sal_Unicode mcSeparator; public: @@ -89,7 +89,7 @@ public: class SC_DLLPUBLIC MergeColumnTransformation : public DataTransformation { - std::set<SCCOL> const maColumns; + std::set<SCCOL> maColumns; OUString maMergeString; public: @@ -103,7 +103,7 @@ public: class SortTransformation : public DataTransformation { - ScSortParam const maSortParam; + ScSortParam maSortParam; public: SortTransformation(const ScSortParam& rParam); @@ -114,8 +114,8 @@ public: class SC_DLLPUBLIC TextTransformation : public DataTransformation { - std::set<SCCOL> const mnCol; - TEXT_TRANSFORM_TYPE const maType; + std::set<SCCOL> mnCol; + TEXT_TRANSFORM_TYPE maType; public: TextTransformation(const std::set<SCCOL>& nCol, const TEXT_TRANSFORM_TYPE rType); @@ -127,8 +127,8 @@ class SC_DLLPUBLIC TextTransformation : public DataTransformation class SC_DLLPUBLIC AggregateFunction : public DataTransformation { - std::set<SCCOL> const maColumns; - AGGREGATE_FUNCTION const maType; + std::set<SCCOL> maColumns; + AGGREGATE_FUNCTION maType; public: AggregateFunction(const std::set<SCCOL>& rColumns, const AGGREGATE_FUNCTION rType); @@ -140,9 +140,9 @@ class SC_DLLPUBLIC AggregateFunction : public DataTransformation class SC_DLLPUBLIC NumberTransformation : public DataTransformation { - std::set<SCCOL> const mnCol; - NUMBER_TRANSFORM_TYPE const maType; - int const maPrecision; + std::set<SCCOL> mnCol; + NUMBER_TRANSFORM_TYPE maType; + int maPrecision; public: NumberTransformation(const std::set<SCCOL>& nCol, const NUMBER_TRANSFORM_TYPE rType); @@ -157,8 +157,8 @@ class SC_DLLPUBLIC NumberTransformation : public DataTransformation class SC_DLLPUBLIC ReplaceNullTransformation : public DataTransformation { - std::set<SCCOL> const mnCol; - OUString const msReplaceWith; + std::set<SCCOL> mnCol; + OUString msReplaceWith; public: ReplaceNullTransformation(const std::set<SCCOL>& nCol, const OUString& sReplaceWith); @@ -170,8 +170,8 @@ class SC_DLLPUBLIC ReplaceNullTransformation : public DataTransformation class SC_DLLPUBLIC DateTimeTransformation : public DataTransformation { - std::set<SCCOL> const mnCol; - DATETIME_TRANSFORMATION_TYPE const maType; + std::set<SCCOL> mnCol; + DATETIME_TRANSFORMATION_TYPE maType; public: DateTimeTransformation(const std::set<SCCOL>& nCol, diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index eae20618d961..27b02e2986ea 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -53,7 +53,7 @@ private: ScViewData* pViewData; const ScDocument& rDoc; bool bRefInputMode; - ScAddress::Details const aAddrDetails; + ScAddress::Details aAddrDetails; ScDBCollection aLocalDbCol; ScRange theCurArea; diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 9bf99e197f23..d1b36587732f 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -84,7 +84,7 @@ private: private: SvtCalendarBox& mrEdValue; - Date const maNullDate; + Date maNullDate; }; class ScDPNumGroupDlg : public weld::GenericDialogController diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 6fec11610e2c..50e56cac1364 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -58,7 +58,7 @@ private: ScRangeListVector m_aProtectedChartRangesVector; - OUString const maShellID; + OUString maShellID; void InitDocShell(); SdrOle2Obj* GetSingleObject(); diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 35143be14087..b26ffbe1d155 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -51,8 +51,8 @@ public: bool VerifyPosStr ( const OUString& rPosStr ) const; private: - ScViewData* const pViewData; - ScDocument* const pDoc; + ScViewData* pViewData; + ScDocument* pDoc; weld::CheckButton* pBtnCase; weld::CheckButton* pBtnRegExp; diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 38ae8f84b082..d95b4f0d40cf 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -45,7 +45,7 @@ protected: VclPtr<vcl::Window> pWindow; SdrModel* pDrDoc; - SfxRequest const aSfxRequest; + SfxRequest aSfxRequest; Timer aScrollTimer; // for Autoscrolling DECL_LINK( ScrollHdl, Timer *, void ); diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx index 70cd96dfe8aa..a6c484afa7f3 100644 --- a/sc/source/ui/inc/gridmerg.hxx +++ b/sc/source/ui/inc/gridmerg.hxx @@ -26,8 +26,8 @@ class ScGridMerger { private: VclPtr<OutputDevice> pDev; - long const nOneX; - long const nOneY; + long nOneX; + long nOneY; long nFixStart; long nFixEnd; long nVarStart; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index c46c01dda25c..6369e5fcf159 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -134,7 +134,7 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, public DropTargetHel std::unique_ptr<sc::SpellCheckContext> mpSpellCheckCxt; ScViewData* pViewData; - ScSplitPos const eWhich; + ScSplitPos eWhich; ScHSplitPos eHWhich; ScVSplitPos eVWhich; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index f3d7ee0b6638..5b1dc000f656 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -40,13 +40,13 @@ private: vcl::Font aBoldFont; bool bBoldSet; - bool const bVertical; // Vertical = Row header + bool bVertical; // Vertical = Row header long nWidth; long nSmallWidth; long nBigWidth; - SCCOLROW const nSize; + SCCOLROW nSize; SCCOLROW nMarkStart; SCCOLROW nMarkEnd; diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index 3a1d92c175c3..fe50a37f84ed 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.hxx @@ -25,8 +25,8 @@ struct ScHighlightEntry { - ScRange const aRef; - Color const aColor; + ScRange aRef; + Color aColor; ScHighlightEntry( const ScRange& rR, const Color& rC ) : aRef(rR), aColor(rC) {} diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 91163c4c34e8..2cda5bf24718 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -54,14 +54,14 @@ class SC_DLLPUBLIC ScImportExport OUString aNonConvertibleChars; OUString maFilterOptions; sal_uInt32 nSizeLimit; - SCROW const nMaxImportRow; + SCROW nMaxImportRow; sal_Unicode cSep; // Separator sal_Unicode cStr; // String Delimiter bool bFormulas; // Formula in Text? bool bIncludeFiltered; // include filtered rows? (default true) bool bAll; // no selection bool bSingle; // Single selection - bool const bUndo; // with Undo? + bool bUndo; // with Undo? bool bOverflowRow; // too many rows bool bOverflowCol; // too many columns bool bOverflowCell; // too much data for a cell diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index decadab2568e..974b267e141a 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -44,7 +44,7 @@ class ScMessagePool: public SfxItemPool ScCondFormatDlgItem aCondFormatDlgItem; std::vector<SfxPoolItem*> mvPoolDefaults; - ScDocumentPool* const pDocPool; + ScDocumentPool* pDocPool; public: ScMessagePool(); diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 5b13f22c60dc..7225f592d231 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -22,11 +22,11 @@ class ScViewData; class ScNameDefDlg : public ScAnyRefDlgController { private: - bool const mbUndo; //if true we need to add an undo action after creating a range name + bool mbUndo; //if true we need to add an undo action after creating a range name ScDocument& mrDoc; ScDocShell* mpDocShell; - ScAddress const maCursorPos; + ScAddress maCursorPos; OUString maStrInfoDefault; const OUString maGlobalNameStr; const OUString maErrInvalidNameStr; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index 9b6ce575440d..d092f7d18cf7 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -33,7 +33,7 @@ class SC_DLLPUBLIC ScRangeManagerTable private: std::unique_ptr<weld::TreeView> m_xTreeView; - OUString const maGlobalString; + OUString maGlobalString; // should be const because we should not modify it here const std::map<OUString, std::unique_ptr<ScRangeName>>& m_RangeMap; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 4a6c3ea92d0a..0a21b9877b8e 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -111,7 +111,7 @@ private: OUString aStrActive; OUString aStrNotActive; OUString aStrHidden; - OUString const aStrActiveWin; + OUString aStrActiveWin; std::unique_ptr<ScArea> pMarkArea; ScViewData* pViewData; diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index 81f1d7cb2056..11297e42a6f9 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -40,13 +40,13 @@ private: VclPtr<vcl::Window> m_pBottomWin; VclPtr<vcl::Window> m_pDiagWin; ScDocument* m_pDoc; - ScAddress const m_aDocPos; - OUString const m_aUserText; + ScAddress m_aDocPos; + OUString m_aUserText; tools::Rectangle m_aVisRect; Timer m_aTimer; - MapMode const m_aMapMode; - bool const m_bLeft; - bool const m_bByKeyboard; + MapMode m_aMapMode; + bool m_bLeft; + bool m_bByKeyboard; tools::Rectangle m_aRect; std::unique_ptr<SdrModel> m_pModel; diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index b601417b4cc4..806960cc762f 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -34,8 +34,8 @@ class ScOutlineWindow : public vcl::Window { private: ScViewData& mrViewData; /// View data containing the document. - ScSplitPos const meWhich; /// Which area in split window. - bool const mbHoriz; /// true = Horizontal orientation. + ScSplitPos meWhich; /// Which area in split window. + bool mbHoriz; /// true = Horizontal orientation. bool mbMirrorEntries; /// true = mirror the order of entries (including header) bool mbMirrorLevels; /// true = mirror the order of levels, including the border diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index d5586172c0fa..09ed06d6dd46 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -57,15 +57,15 @@ struct ScOptConditionRow /// All settings from the dialog, saved with the DocShell for the next call class ScOptSolverSave { - OUString const maObjective; - bool const mbMax; - bool const mbMin; - bool const mbValue; - OUString const maTarget; - OUString const maVariable; - std::vector<ScOptConditionRow> const maConditions; - OUString const maEngine; - css::uno::Sequence<css::beans::PropertyValue> const maProperties; + OUString maObjective; + bool mbMax; + bool mbMin; + bool mbValue; + OUString maTarget; + OUString maVariable; + std::vector<ScOptConditionRow> maConditions; + OUString maEngine; + css::uno::Sequence<css::beans::PropertyValue> maProperties; public: ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue, @@ -101,8 +101,8 @@ public: virtual void Close() override; private: - OUString const maInputError; - OUString const maConditionError; + OUString maInputError; + OUString maConditionError; ScDocShell* mpDocShell; ScDocument& mrDoc; diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index fbdd991962cc..6cb8af794c58 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -110,12 +110,12 @@ private: class DrawEditParam { public: - SvxCellHorJustify const meHorJustAttr; ///< alignment attribute + SvxCellHorJustify meHorJustAttr; ///< alignment attribute SvxCellHorJustify meHorJustContext; ///< context depending on attribute, content and direction SvxCellHorJustify meHorJustResult; ///< result for EditEngine SvxCellVerJustify meVerJust; - SvxCellJustifyMethod const meHorJustMethod; - SvxCellJustifyMethod const meVerJustMethod; + SvxCellJustifyMethod meHorJustMethod; + SvxCellJustifyMethod meVerJustMethod; SvxCellOrientation meOrient; SCSIZE mnArrY; SCCOL mnX; @@ -124,8 +124,8 @@ private: long mnPosX; long mnPosY; long mnInitPosX; - bool const mbBreak:1; - bool const mbCellIsValue:1; + bool mbBreak:1; + bool mbCellIsValue:1; bool mbAsianVertical:1; bool mbPixelToLogic:1; bool mbHyphenatorSet:1; @@ -177,25 +177,25 @@ private: VclPtr<OutputDevice> pFmtDevice; // reference for text formatting ScTableInfo& mrTabInfo; RowInfo* pRowInfo; // Info block - SCSIZE const nArrCount; // occupied lines in info block + SCSIZE nArrCount; // occupied lines in info block ScDocument* mpDoc; // Document SCTAB nTab; // sheet - long const nScrX; // Output Startpos. (Pixel) - long const nScrY; + long nScrX; // Output Startpos. (Pixel) + long nScrY; long nScrW; // Output size (Pixel) long nScrH; long nMirrorW; // Visible output width for mirroring (default: nScrW) - SCCOL const nX1; // Start-/End coordinates - SCROW const nY1; // ( incl. hidden ) - SCCOL const nX2; - SCROW const nY2; + SCCOL nX1; // Start-/End coordinates + SCROW nY1; // ( incl. hidden ) + SCCOL nX2; + SCROW nY2; SCCOL nVisX1; // Start-/End coordinates SCROW nVisY1; // ( visible range ) SCCOL nVisX2; SCROW nVisY2; - ScOutputType const eType; // Screen/Printer ... - double const mnPPTX; // Pixel per Twips - double const mnPPTY; + ScOutputType eType; // Screen/Printer ... + double mnPPTX; // Pixel per Twips + double mnPPTY; Fraction aZoomX; Fraction aZoomY; @@ -213,7 +213,7 @@ private: bool bSolidBackground; // white instead of transparent bool mbUseStyleColor; - bool const mbForceAutoColor; + bool mbForceAutoColor; bool mbSyntaxMode; // Syntax highlighting std::unique_ptr<Color> pValueColor; diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index cd2a96f0ac35..f58b4d84399b 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -51,7 +51,7 @@ private: std::unique_ptr<ScQueryItem> pOutItem; ScViewData* pViewData; ScDocument* pDoc; - SCTAB const nSrcTab; + SCTAB nSrcTab; std::unique_ptr<weld::ComboBox> m_xLbField1; std::unique_ptr<weld::ComboBox> m_xLbCond1; diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx index 8cebf10910ee..34aa81b6538a 100644 --- a/sc/source/ui/inc/prevloc.hxx +++ b/sc/source/ui/inc/prevloc.hxx @@ -89,7 +89,7 @@ public: typedef std::list<std::unique_ptr<ScPreviewLocationEntry>> Entries_t; private: VclPtr<OutputDevice> pWindow; - ScDocument* const pDoc; + ScDocument* pDoc; MapMode aCellMapMode; MapMode aDrawMapMode[SC_PREVIEW_MAXRANGES]; tools::Rectangle aDrawRectangle[SC_PREVIEW_MAXRANGES]; diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 967d5bb839c0..60321a73f038 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -68,10 +68,10 @@ private: void DeleteSheets(); private: - OUString const maTextNotProtected; - OUString const maTextNotPassProtected; - OUString const maTextHashBad; - OUString const maTextHashGood; + OUString maTextNotProtected; + OUString maTextNotPassProtected; + OUString maTextHashBad; + OUString maTextHashGood; DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(RetypeBtnHdl, weld::Button&, void); @@ -109,7 +109,7 @@ private: void CheckPasswordInput(); private: - ScPassHashProtectable* const m_pProtected; + ScPassHashProtectable* m_pProtected; std::unique_ptr<weld::Button> m_xBtnOk; diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index d1c543a6f3ac..e6f04e07c39b 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -29,7 +29,7 @@ struct ScRangeFindData { ScRange aRef; - ScRefFlags const nFlags; + ScRefFlags nFlags; sal_Int32 nSelStart; sal_Int32 nSelEnd; Color nColor; @@ -41,7 +41,7 @@ struct ScRangeFindData class ScRangeFindList { std::vector<ScRangeFindData> maEntries; - OUString const aDocName; + OUString aDocName; bool bHidden; sal_uInt16 nIndexColor; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 2774d167a2a6..97cc05e7bd5d 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -38,8 +38,8 @@ public: Color& rColor, ScScenarioFlags &rFlags) const; private: - const OUString aDefScenarioName; - bool const bIsEdit; + OUString aDefScenarioName; + bool bIsEdit; std::unique_ptr<weld::Entry> m_xEdName; std::unique_ptr<weld::TextView> m_xEdComment; std::unique_ptr<weld::CheckButton> m_xCbShowFrame; diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 052f85a4bef5..9128a196a84d 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -52,7 +52,7 @@ class ScImportAsciiDlg : public weld::GenericDialogController rtl_TextEncoding meCharSet; /// Selected char set. bool mbCharSetSystem; /// Is System char set selected? - ScImportAsciiCall const meCall; /// How the dialog is called (see asciiopt.hxx) + ScImportAsciiCall meCall; /// How the dialog is called (see asciiopt.hxx) bool mbDetectSpaceSep; /// Whether to detect a possible space separator. std::unique_ptr<weld::Label> mxFtCharSet; diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 3b05ec1dfd60..5fee72451235 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -35,11 +35,11 @@ public: OUString GetCurrFormatName(); private: - OUString const aStrTitle; - OUString const aStrLabel; - OUString const aStrClose; - OUString const aStrDelMsg; - OUString const aStrRename; + OUString aStrTitle; + OUString aStrLabel; + OUString aStrClose; + OUString aStrDelMsg; + OUString aStrRename; ScAutoFormat* pFormat; const ScAutoFormatData* pSelFmtData; diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index a3c55ccddfcd..27d0db36b454 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -47,7 +47,7 @@ private: std::unique_ptr<ScDelimiterTable> pFieldSepTab; std::unique_ptr<ScDelimiterTable> pTextSepTab; - bool const m_bIsAsciiImport; + bool m_bIsAsciiImport; std::unique_ptr<weld::Frame> m_xFieldFrame; std::unique_ptr<weld::Label> m_xFtCharset; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index fd3c301e7653..b0f0d32c4134 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -61,7 +61,7 @@ protected: virtual ~ScHFEditPage() override; private: - sal_uInt16 const nWhich; + sal_uInt16 nWhich; bool m_bDropDownActive; sal_Int64 m_nTimeToggled; diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index 137b999d967c..de48e1c9c4ac 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -21,8 +21,8 @@ namespace sc { class SearchResultsDlg : public SfxDialogController { - OUString const aSkipped; - SfxBindings* const mpBindings; + OUString aSkipped; + SfxBindings* mpBindings; ScDocument* mpDoc; std::unique_ptr<weld::TreeView> mxList; std::unique_ptr<weld::Label> mxSearchResults; diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 29ab6ab21b5d..1ac699970d4c 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -37,7 +37,7 @@ class ScSortKeyWindow public: ScSortKeyItems m_aSortKeyItems; private: - weld::Container* const m_pBox; + weld::Container* m_pBox; public: ScSortKeyWindow(weld::Container* pBox); diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index 2add81559567..48dbb826bde0 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -77,7 +77,7 @@ protected: // for usage in derived classes ScDocument& mrDoc; private: - ScSelectionState const maSelState; /// Selection data of the document. + ScSelectionState maSelState; /// Selection data of the document. ScDocument* mpUndoDoc; /// Document stores all old cells for UNDO action. ScDocument* mpRedoDoc; /// Document stores all new cells for REDO action. LanguageType meCurrLang; /// Current cell language. @@ -146,7 +146,7 @@ protected: virtual bool NeedsConversion() override; private: - ScConversionParam const maConvParam; /// Conversion parameters. + ScConversionParam maConvParam; /// Conversion parameters. }; #endif diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index 6495a796ac5f..96660b983493 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.hxx @@ -60,13 +60,13 @@ public: bool IsInteractive() const { return mbIsInteractive; } private: - ScConversionType const meConvType; /// Type of the conversion. - LanguageType const meSourceLang; /// Source language for conversion. - LanguageType const meTargetLang; /// Target language for conversion. - vcl::Font maTargetFont; /// Target font to be used if language has to be changed. - sal_Int32 mnOptions; /// Conversion options. - bool const mbUseTargetFont; /// True = Use maTargetFont to change font during conversion. - bool const mbIsInteractive; /// True = Text conversion has (specific) dialog that may be raised. + ScConversionType meConvType; /// Type of the conversion. + LanguageType meSourceLang; /// Source language for conversion. + LanguageType meTargetLang; /// Target language for conversion. + vcl::Font maTargetFont; /// Target font to be used if language has to be changed. + sal_Int32 mnOptions; /// Conversion options. + bool mbUseTargetFont; /// True = Use maTargetFont to change font during conversion. + bool mbIsInteractive; /// True = Text conversion has (specific) dialog that may be raised. }; #endif diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 471039fca686..d9911794c2d0 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -54,7 +54,7 @@ private: ScRefAddress theRowCell; ScRefAddress theColCell; - ScDocument* const pDoc; + ScDocument* pDoc; const SCTAB nCurTab; bool bDlgLostFocus; const OUString errMsgNoFormula; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 8a8d3e9125cc..78182b799489 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -70,7 +70,7 @@ enum HeaderType class ScCornerButton : public vcl::Window { private: - ScViewData* const pViewData; + ScViewData* pViewData; protected: virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; @@ -111,7 +111,7 @@ private: void Modifier(ScGridWindow* pWin); private: - ScTabViewShell* const mpThisViewShell; + ScTabViewShell* mpThisViewShell; std::array<VclPtr<ScGridWindow>, 4> const & mpGridWin; EditView* mpOtherEditView; int nTotalWindows; diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx index 755591835b9e..6c42308a6ac9 100644 --- a/sc/source/ui/inc/target.hxx +++ b/sc/source/ui/inc/target.hxx @@ -27,7 +27,7 @@ class ScTabViewShell; class ScTabViewTarget : public SfxRepeatTarget { private: - ScTabViewShell* const pViewShell; + ScTabViewShell* pViewShell; public: diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 150a5a615d11..21bc8c526ec7 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -38,7 +38,7 @@ public: private: std::unique_ptr<ScDocOptions> pOldOptions; std::unique_ptr<ScDocOptions> pLocalOptions; - sal_uInt16 const nWhichCalc; + sal_uInt16 nWhichCalc; std::unique_ptr<weld::CheckButton> m_xBtnIterate; std::unique_ptr<weld::Label> m_xFtSteps; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 1da61965b4b0..1c59ef1a2f1a 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -57,9 +57,9 @@ protected: private: Idle m_aIdle; - OUString const aStrUndefined; - OUString const aStrColumn; - OUString const aStrRow; + OUString aStrUndefined; + OUString aStrColumn; + OUString aStrRow; const sal_uInt16 nWhichSort; ScViewData* pViewData; @@ -106,9 +106,9 @@ protected: virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: - OUString const aStrRowLabel; - OUString const aStrColLabel; - OUString const aStrUndefined; + OUString aStrRowLabel; + OUString aStrColLabel; + OUString aStrUndefined; const sal_uInt16 nWhichSort; ScSortParam aSortData; diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 5c4284101215..180e8e71a887 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -43,10 +43,10 @@ struct ScQueryParam; class ScInputStatusItem : public SfxPoolItem { - ScAddress const aCursorPos; - ScAddress const aStartPos; - ScAddress const aEndPos; - OUString const aString; + ScAddress aCursorPos; + ScAddress aStartPos; + ScAddress aEndPos; + OUString aString; std::unique_ptr<EditTextObject> pEditData; const std::vector<editeng::MisspellRanges>* mpMisspellRanges; @@ -83,9 +83,9 @@ public: class ScTablesHint : public SfxHint { - sal_uInt16 const nId; - SCTAB const nTab1; - SCTAB const nTab2; + sal_uInt16 nId; + SCTAB nTab1; + SCTAB nTab2; public: ScTablesHint(sal_uInt16 nNewId, SCTAB nTable1, SCTAB nTable2=0); @@ -98,8 +98,8 @@ public: class ScEditViewHint : public SfxHint { - ScEditEngineDefaulter* const pEditEngine; - ScAddress const aCursorPos; + ScEditEngineDefaulter* pEditEngine; + ScAddress aCursorPos; public: ScEditViewHint() = delete; @@ -114,7 +114,7 @@ public: class ScIndexHint : public SfxHint { - sal_uInt16 const nIndex; + sal_uInt16 nIndex; public: ScIndexHint(SfxHintId nNewId, sal_uInt16 nIdx); @@ -142,7 +142,7 @@ public: const ScSortParam& GetSortData () const { return theSortData; } private: - ScViewData* const pViewData; + ScViewData* pViewData; ScSortParam theSortData; }; @@ -168,7 +168,7 @@ public: private: std::unique_ptr<ScQueryParam> mpQueryData; - ScViewData* const pViewData; + ScViewData* pViewData; ScRange aAdvSource; bool bIsAdvanced; }; @@ -190,7 +190,7 @@ public: const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } private: - ScViewData* const pViewData; + ScViewData* pViewData; ScSubTotalParam theSubTotalData; }; diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 903b63ec51f3..d497e798ebc0 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -85,7 +85,7 @@ public: protected: ScRange aBlockRange; std::unique_ptr<SdrUndoAction> pDrawUndo; - ScBlockUndoMode const eMode; + ScBlockUndoMode eMode; void BeginUndo(); void EndUndo(); @@ -120,7 +120,7 @@ class ScDBFuncUndo: public ScSimpleUndo { protected: std::unique_ptr<ScDBData> pAutoDBRange; - ScRange const aOriginalRange; + ScRange aOriginalRange; public: ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal ); diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 875766b34270..a4a8ba034cea 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -56,14 +56,14 @@ public: private: ScRange aEffRange; - SCTAB const nCount; + SCTAB nCount; std::unique_ptr<SCTAB[]> pTabs; std::unique_ptr<SCTAB[]> pScenarios; sal_uLong nEndChangeAction; - InsCellCmd const eCmd; - bool const bPartOfPaste; + InsCellCmd eCmd; + bool bPartOfPaste; std::unique_ptr<SfxUndoAction> pPasteUndo; @@ -89,14 +89,14 @@ public: private: ScRange aEffRange; - SCTAB const nCount; + SCTAB nCount; std::unique_ptr<SCTAB[]> pTabs; std::unique_ptr<SCTAB[]> pScenarios; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; - DelCellCmd const eCmd; + DelCellCmd eCmd; void DoChange ( const bool bUndo ); void SetChangeTrack(); @@ -121,9 +121,9 @@ public: virtual OUString GetComment() const override; private: - bool const mbRows:1; - bool const mbRefresh:1; - SCTAB const nTab; + bool mbRows:1; + bool mbRefresh:1; + SCTAB nTab; std::vector<sc::ColRowSpan> maSpans; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -150,10 +150,10 @@ public: virtual OUString GetComment() const override; private: - ScMarkData const aMarkData; + ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; - ScRange const aExtendedRange; + ScRange aExtendedRange; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -201,7 +201,7 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; ScDocumentUniquePtr pRedoDoc; - InsertDeleteFlags const nFlags; + InsertDeleteFlags nFlags; std::unique_ptr<ScRefUndoData> pRefUndoData; std::unique_ptr<ScRefUndoData> pRefRedoData; sal_uLong nStartChangeAction; @@ -233,12 +233,12 @@ private: sal_uInt16 mnPaintExtFlags; ScRangeList maPaintRanges; - ScRange const aSrcRange; + ScRange aSrcRange; ScRange aDestRange; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; - bool const bCut; - bool const bKeepScenarioFlags; + bool bCut; + bool bKeepScenarioFlags; void PaintArea( ScRange aRange, sal_uInt16 nExtFlags ) const; void DoUndo( ScRange aRange ); @@ -268,14 +268,14 @@ public: private: std::shared_ptr<DataSpansType> mpDataSpans; // Spans of non-empty cells. - ScRange const aRange; + ScRange aRange; ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; // Block mark and deleted data std::unique_ptr<SdrUndoAction> pDrawUndo; // Deleted objects sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; - InsertDeleteFlags const nFlags; - bool const bMulti; // Multi selection + InsertDeleteFlags nFlags; + bool bMulti; // Multi selection void DoChange( const bool bUndo ); void SetChangeTrack(); @@ -300,18 +300,18 @@ public: virtual OUString GetComment() const override; private: - ScRange const aRange; + ScRange aRange; ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; // Block mark and deleted data sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; - InsertDeleteFlags const nFlags; - ScPasteFunc const nFunction; - SCTAB const nSrcTab; - bool const bMulti; // Multi selection - bool const bSkipEmpty; - bool const bAsLink; + InsertDeleteFlags nFlags; + ScPasteFunc nFunction; + SCTAB nSrcTab; + bool bMulti; // Multi selection + bool bSkipEmpty; + bool bAsLink; void DoChange( const bool bUndo ); void SetChangeTrack(); @@ -341,11 +341,11 @@ public: ScEditDataArray* GetDataArray(); private: ScMarkData aMarkData; - ScRange const aRange; + ScRange aRange; ScRange aRangeCover; std::unique_ptr<ScEditDataArray> mpDataArray; ScDocumentUniquePtr pUndoDoc; - bool const bMulti; + bool bMulti; ScPatternAttr* pApplyPattern; SvxBoxItem* pLineOuter; SvxBoxInfoItem* pLineInner; @@ -376,17 +376,17 @@ public: virtual OUString GetComment() const override; private: - ScMarkData aMarkData; - SCCOLROW const nStart; - SCCOLROW const nEnd; - SCTAB const nStartTab; - SCTAB const nEndTab; + ScMarkData aMarkData; + SCCOLROW nStart; + SCCOLROW nEnd; + SCTAB nStartTab; + SCTAB nEndTab; ScDocumentUniquePtr pUndoDoc; std::unique_ptr<ScOutlineTable> pUndoTab; - std::vector<sc::ColRowSpan> const maRanges; - sal_uInt16 const nNewSize; - bool const bWidth; - ScSizeMode const eMode; + std::vector<sc::ColRowSpan> maRanges; + sal_uInt16 nNewSize; + bool bWidth; + ScSizeMode eMode; std::unique_ptr<SdrUndoAction> pDrawUndo; }; @@ -409,16 +409,16 @@ public: virtual OUString GetComment() const override; private: - ScRange const aSource; - ScMarkData aMarkData; + ScRange aSource; + ScMarkData aMarkData; ScDocumentUniquePtr - pUndoDoc; - FillDir const eFillDir; - FillCmd const eFillCmd; - FillDateCmd const eFillDateCmd; - double const fStartValue; - double const fStepValue; - double const fMaxValue; + pUndoDoc; + FillDir eFillDir; + FillCmd eFillCmd; + FillDateCmd eFillDateCmd; + double fStartValue; + double fStepValue; + double fMaxValue; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -441,8 +441,8 @@ public: virtual OUString GetComment() const override; private: - ScCellMergeOption const maOption; - bool const mbMergeContents; // Merge contents in Redo(). + ScCellMergeOption maOption; + bool mbMergeContents; // Merge contents in Redo(). ScDocumentUniquePtr mxUndoDoc; // when data is merged std::unique_ptr<SdrUndoAction> mpDrawUndo; @@ -467,10 +467,10 @@ public: private: ScDocumentUniquePtr - pUndoDoc; // deleted data - ScMarkData aMarkData; - bool const bSize; - sal_uInt16 const nFormatNo; + pUndoDoc; // deleted data + ScMarkData aMarkData; + bool bSize; + sal_uInt16 nFormatNo; }; class ScUndoReplace: public ScSimpleUndo @@ -491,9 +491,9 @@ public: virtual OUString GetComment() const override; private: - ScAddress const aCursorPos; - ScMarkData const aMarkData; - OUString const aUndoStr; // Data at single selection + ScAddress aCursorPos; + ScMarkData aMarkData; + OUString aUndoStr; // Data at single selection ScDocumentUniquePtr pUndoDoc; // Block mark and deleted data std::unique_ptr<SvxSearchItem> pSearchItem; sal_uLong nStartChangeAction; @@ -524,14 +524,14 @@ public: virtual OUString GetComment() const override; private: - ScRange const aRange; + ScRange aRange; ScDocumentUniquePtr pUndoDoc; // Deleted data - ScRefAddress const theFormulaCell; - ScRefAddress const theFormulaEnd; - ScRefAddress const theRowCell; - ScRefAddress const theColCell; - ScTabOpParam::Mode const meMode; + ScRefAddress theFormulaCell; + ScRefAddress theFormulaEnd; + ScRefAddress theRowCell; + ScRefAddress theColCell; + ScTabOpParam::Mode meMode; }; class ScUndoConversion : public ScSimpleUndo @@ -552,14 +552,14 @@ public: virtual OUString GetComment() const override; private: - ScMarkData aMarkData; - ScAddress const aCursorPos; - ScDocumentUniquePtr pUndoDoc; // Block mark and deleted data - ScAddress const aNewCursorPos; - ScDocumentUniquePtr pRedoDoc; // Block mark and new data - sal_uLong nStartChangeAction; - sal_uLong nEndChangeAction; - ScConversionParam const maConvParam; /// Conversion type and parameters. + ScMarkData aMarkData; + ScAddress aCursorPos; + ScDocumentUniquePtr pUndoDoc; // Block mark and deleted data + ScAddress aNewCursorPos; + ScDocumentUniquePtr pRedoDoc; // Block mark and new data + sal_uLong nStartChangeAction; + sal_uLong nEndChangeAction; + ScConversionParam maConvParam; /// Conversion type and parameters. void DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPos ); void SetChangeTrack(); @@ -584,8 +584,8 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; ScDocumentUniquePtr pRedoDoc; - ScRange const aRange; - bool const bMulti; + ScRange aRange; + bool bMulti; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -608,8 +608,8 @@ public: virtual OUString GetComment() const override; private: - ScDocumentUniquePtr const xUndoDoc; - ScDocumentUniquePtr const xRedoDoc; + ScDocumentUniquePtr xUndoDoc; + ScDocumentUniquePtr xRedoDoc; void DoChange( ScDocument* pSrcDoc ) const; }; @@ -630,9 +630,9 @@ public: private: void DoChange(ScDocument* pDoc); - ScDocumentUniquePtr const mpUndoDoc; - ScDocumentUniquePtr const mpRedoDoc; - ScRange const maRange; + ScDocumentUniquePtr mpUndoDoc; + ScDocumentUniquePtr mpRedoDoc; + ScRange maRange; }; class ScUndoConditionalFormatList : public ScSimpleUndo @@ -651,9 +651,9 @@ public: private: void DoChange(const ScDocument* pDoc); - ScDocumentUniquePtr const mpUndoDoc; - ScDocumentUniquePtr const mpRedoDoc; - SCTAB const mnTab; + ScDocumentUniquePtr mpUndoDoc; + ScDocumentUniquePtr mpRedoDoc; + SCTAB mnTab; }; class ScUndoUseScenario: public ScSimpleUndo @@ -677,7 +677,7 @@ private: pUndoDoc; ScRange aRange; ScMarkData aMarkData; - OUString const aName; + OUString aName; }; class ScUndoSelectionStyle: public ScSimpleUndo @@ -701,8 +701,8 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; - OUString const aStyleName; - ScRange const aRange; + OUString aStyleName; + ScRange aRange; void DoChange( const bool bUndo ); }; @@ -744,7 +744,7 @@ public: private: ScDocumentUniquePtr pUndoDoc; - OUString const aFormula; + OUString aFormula; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -769,12 +769,12 @@ public: virtual OUString GetComment() const override; private: - OUString const aDocName; + OUString aDocName; OUString aFltName; - OUString const aOptions; + OUString aOptions; OUString aAreaName; - ScRange const aRange; - sal_uLong const nRefreshDelay; + ScRange aRange; + sal_uLong nRefreshDelay; }; class ScUndoRemoveAreaLink : public ScSimpleUndo @@ -795,12 +795,12 @@ public: virtual OUString GetComment() const override; private: - OUString const aDocName; + OUString aDocName; OUString aFltName; - OUString const aOptions; + OUString aOptions; OUString aAreaName; - ScRange const aRange; - sal_uLong const nRefreshDelay; + ScRange aRange; + sal_uLong nRefreshDelay; }; class ScUndoUpdateAreaLink : public ScSimpleUndo //! also change BlockUndo? @@ -826,21 +826,21 @@ public: virtual OUString GetComment() const override; private: - OUString const aOldDoc; - OUString const aOldFlt; - OUString const aOldOpt; - OUString const aOldArea; - ScRange const aOldRange; - OUString const aNewDoc; - OUString const aNewFlt; - OUString const aNewOpt; - OUString const aNewArea; - ScRange const aNewRange; + OUString aOldDoc; + OUString aOldFlt; + OUString aOldOpt; + OUString aOldArea; + ScRange aOldRange; + OUString aNewDoc; + OUString aNewFlt; + OUString aNewOpt; + OUString aNewArea; + ScRange aNewRange; ScDocumentUniquePtr xUndoDoc; ScDocumentUniquePtr xRedoDoc; - sal_uLong const nOldRefresh; - sal_uLong const nNewRefresh; - bool const bWithInsert; + sal_uLong nOldRefresh; + sal_uLong nNewRefresh; + bool bWithInsert; void DoChange( const bool bUndo ) const; }; @@ -863,7 +863,7 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; - bool const bIsIncrement; + bool bIsIncrement; }; class ScUndoTransliterate: public ScBlockUndo @@ -884,7 +884,7 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; - TransliterationFlags const + TransliterationFlags nTransliterationType; }; @@ -925,8 +925,9 @@ public: virtual OUString GetComment() const override; private: - SCTAB const nTab; - ScDocumentUniquePtr pUndoDoc; + SCTAB nTab; + ScDocumentUniquePtr + pUndoDoc; }; class ScUndoRemoveMerge: public ScBlockUndo diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index c62ea7205304..aebd1eabe5bd 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -56,9 +56,9 @@ public: void SetEditData( std::unique_ptr<EditTextObject> pOld, std::unique_ptr<EditTextObject> pNew ); private: - SCCOL const nCol; - SCROW const nRow; - SCTAB const nTab; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; ScPatternAttr* pOldPattern; ScPatternAttr* pNewPattern; ScPatternAttr* pApplyPattern; @@ -98,10 +98,10 @@ public: private: ValuesType maOldValues; - OUString const maNewString; + OUString maNewString; std::unique_ptr<EditTextObject> mpNewEditData; sal_uLong mnEndChangeAction; - ScAddress const maPos; + ScAddress maPos; void DoChange() const; void SetChangeTrack(); @@ -124,10 +124,10 @@ public: virtual OUString GetComment() const override; private: - ScAddress const aPos; - ScCellValue const maOldCell; - double const nValue; - sal_uLong nEndChangeAction; + ScAddress aPos; + ScCellValue maOldCell; + double nValue; + sal_uLong nEndChangeAction; void SetChangeTrack(); }; @@ -151,10 +151,10 @@ private: void MoveCursorToCell(); private: - ScAddress const maPos; - ScCellValue const maOldValue; - ScCellValue const maNewValue; - sal_uLong mnEndChangeAction; + ScAddress maPos; + ScCellValue maOldValue; + ScCellValue maNewValue; + sal_uLong mnEndChangeAction; }; class ScUndoPageBreak: public ScSimpleUndo @@ -173,11 +173,11 @@ public: virtual OUString GetComment() const override; private: - SCCOL const nCol; - SCROW const nRow; - SCTAB const nTab; - bool const bColumn; // Column or row break - bool const bInsert; // Insert or Delete + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + bool bColumn; // Column or row break + bool bInsert; // Insert or Delete void DoChange( bool bInsert ) const; }; @@ -197,11 +197,11 @@ public: virtual OUString GetComment() const override; private: - SCTAB const nTab; - sal_uInt16 const nOldScale; - sal_uInt16 const nOldPages; - sal_uInt16 const nNewScale; - sal_uInt16 const nNewPages; + SCTAB nTab; + sal_uInt16 nOldScale; + sal_uInt16 nOldPages; + sal_uInt16 nNewScale; + sal_uInt16 nNewPages; void DoChange( bool bUndo ); }; @@ -222,13 +222,13 @@ public: virtual OUString GetComment() const override; private: - SCCOL const nCol; - SCROW const nRow; - SCTAB const nTab; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; sal_uLong nEndChangeAction; - ScCellValue const maOldText; - ScCellValue const maNewText; + ScCellValue maOldText; + ScCellValue maNewText; void DoChange( bool bUndo, const ScCellValue& rText ); void SetChangeTrack( const ScCellValue& rOldCell ); @@ -269,7 +269,7 @@ private: void DoRemoveNote( const ScNoteData& rNoteData ); private: - ScAddress const maPos; + ScAddress maPos; ScNoteData maOldData; ScNoteData maNewData; std::unique_ptr<SdrUndoAction> mpDrawUndo; @@ -290,8 +290,8 @@ public: virtual OUString GetComment() const override; private: - ScAddress const maPos; - bool const mbShown; + ScAddress maPos; + bool mbShown; }; class ScUndoDetective: public ScSimpleUndo @@ -335,7 +335,7 @@ public: private: std::unique_ptr<ScRangeName> pOldRanges; std::unique_ptr<ScRangeName> pNewRanges; - SCTAB const mnTab; + SCTAB mnTab; void DoChange( bool bUndo ); }; @@ -344,7 +344,7 @@ namespace sc { class UndoSetCells : public ScSimpleUndo { - ScAddress const maTopPos; + ScAddress maTopPos; CellValues maOldValues; CellValues maNewValues; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 5ff7159a2e4e..6cde8b10e28e 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -51,15 +51,15 @@ public: virtual OUString GetComment() const override; private: - SCCOLROW const nStart; - SCCOLROW const nEnd; - SCTAB const nTab; + SCCOLROW nStart; + SCCOLROW nEnd; + SCTAB nTab; ScDocumentUniquePtr - pUndoDoc; - bool const bColumns; - sal_uInt16 const nLevel; - sal_uInt16 const nEntry; - bool const bShow; + pUndoDoc; + bool bColumns; + sal_uInt16 nLevel; + sal_uInt16 nEntry; + bool bShow; }; class ScUndoMakeOutline: public ScSimpleUndo @@ -80,12 +80,12 @@ public: virtual OUString GetComment() const override; private: - ScAddress const aBlockStart; - ScAddress const aBlockEnd; + ScAddress aBlockStart; + ScAddress aBlockEnd; std::unique_ptr<ScOutlineTable> - pUndoTable; - bool const bColumns; - bool const bMake; + pUndoTable; + bool bColumns; + bool bMake; }; class ScUndoOutlineLevel: public ScSimpleUndo @@ -104,13 +104,13 @@ public: virtual OUString GetComment() const override; private: - SCCOLROW const nStart; - SCCOLROW const nEnd; - SCTAB const nTab; - ScDocumentUniquePtr xUndoDoc; + SCCOLROW nStart; + SCCOLROW nEnd; + SCTAB nTab; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; - bool const bColumns; - sal_uInt16 const nLevel; + bool bColumns; + sal_uInt16 nLevel; }; class ScUndoOutlineBlock: public ScSimpleUndo @@ -130,11 +130,11 @@ public: virtual OUString GetComment() const override; private: - ScAddress const aBlockStart; - ScAddress const aBlockEnd; - ScDocumentUniquePtr xUndoDoc; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; - bool const bShow; + bool bShow; }; class ScUndoRemoveAllOutlines: public ScSimpleUndo @@ -153,9 +153,9 @@ public: virtual OUString GetComment() const override; private: - ScAddress const aBlockStart; - ScAddress const aBlockEnd; - ScDocumentUniquePtr xUndoDoc; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; }; @@ -175,9 +175,9 @@ public: virtual OUString GetComment() const override; private: - ScAddress const aBlockStart; - ScAddress const aBlockEnd; - ScDocumentUniquePtr xUndoDoc; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; }; @@ -197,10 +197,10 @@ public: virtual OUString GetComment() const override; private: - SCTAB const nTab; - ScSubTotalParam const aParam; // The original passed parameter - SCROW const nNewEndRow; // Size of result - ScDocumentUniquePtr xUndoDoc; + SCTAB nTab; + ScSubTotalParam aParam; // The original passed parameter + SCROW nNewEndRow; // Size of result + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; std::unique_ptr<ScRangeName> xUndoRange; std::unique_ptr<ScDBCollection> xUndoDB; @@ -224,22 +224,22 @@ public: private: std::unique_ptr<SdrUndoAction> pDrawUndo; - SCTAB const nTab; - ScQueryParam const aQueryParam; - ScDocumentUniquePtr xUndoDoc; + SCTAB nTab; + ScQueryParam aQueryParam; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScDBCollection> xUndoDB; // due to source and target range - ScRange aOldDest; - ScRange aAdvSource; - bool bIsAdvanced; - bool bDestArea; - bool const bDoSize; + ScRange aOldDest; + ScRange aAdvSource; + bool bIsAdvanced; + bool bDestArea; + bool bDoSize; }; class ScUndoAutoFilter: public ScDBFuncUndo { private: - OUString const aDBName; - bool const bFilterSet; + OUString aDBName; + bool bFilterSet; void DoChange( bool bUndo ); @@ -293,16 +293,16 @@ public: virtual OUString GetComment() const override; private: - SCTAB const nTab; - ScImportParam const aImportParam; - SCCOL const nEndCol; - SCROW const nEndRow; - ScDocumentUniquePtr xUndoDoc; - ScDocumentUniquePtr xRedoDoc; + SCTAB nTab; + ScImportParam aImportParam; + SCCOL nEndCol; + SCROW nEndRow; + ScDocumentUniquePtr xUndoDoc; + ScDocumentUniquePtr xRedoDoc; std::unique_ptr<ScDBData> xUndoDBData; std::unique_ptr<ScDBData> xRedoDBData; - SCCOL const nFormulaCols; - bool bRedoFilled; + SCCOL nFormulaCols; + bool bRedoFilled; }; class ScUndoRepeatDB: public ScSimpleUndo @@ -323,17 +323,17 @@ public: virtual OUString GetComment() const override; private: - ScAddress const aBlockStart; - ScAddress const aBlockEnd; - SCROW const nNewEndRow; - ScAddress const aCursorPos; - ScDocumentUniquePtr xUndoDoc; + ScAddress aBlockStart; + ScAddress aBlockEnd; + SCROW nNewEndRow; + ScAddress aCursorPos; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; std::unique_ptr<ScRangeName> xUndoRange; std::unique_ptr<ScDBCollection> xUndoDB; - ScRange aOldQuery; - ScRange aNewQuery; - bool bQuerySize; + ScRange aOldQuery; + ScRange aNewQuery; + bool bQuerySize; }; class ScUndoDataPilot: public ScSimpleUndo @@ -356,7 +356,7 @@ private: ScDocumentUniquePtr xNewUndoDoc; std::unique_ptr<ScDPObject> xOldDPObject; std::unique_ptr<ScDPObject> xNewDPObject; - bool const bAllowMove; + bool bAllowMove; }; class ScUndoConsolidate: public ScSimpleUndo @@ -376,11 +376,11 @@ public: virtual OUString GetComment() const override; private: - ScArea const aDestArea; - ScDocumentUniquePtr xUndoDoc; - ScConsolidateParam const aParam; - bool const bInsRef; - SCSIZE const nInsertCount; + ScArea aDestArea; + ScDocumentUniquePtr xUndoDoc; + ScConsolidateParam aParam; + bool bInsRef; + SCSIZE nInsertCount; std::unique_ptr<ScOutlineTable> xUndoTab; std::unique_ptr<ScDBData> xUndoData; }; @@ -404,15 +404,15 @@ public: virtual OUString GetComment() const override; private: - OUString const aChartName; + OUString aChartName; ScRangeListRef aOldRangeListRef; bool bOldColHeaders; bool bOldRowHeaders; // ScRange aNewRange; ScRangeListRef aNewRangeListRef; - bool const bNewColHeaders; - bool const bNewRowHeaders; - bool const bAddRange; + bool bNewColHeaders; + bool bNewRowHeaders; + bool bAddRange; void Init(); }; @@ -435,7 +435,7 @@ public: private: std::unique_ptr<ScMarkData> mxMarkData; - ScDocumentUniquePtr const xUndoDoc; + ScDocumentUniquePtr xUndoDoc; ScDocumentUniquePtr xRedoDoc; std::unique_ptr<ScRefUndoData> xRefUndoData; std::unique_ptr<ScRefUndoData> xRefRedoData; diff --git a/sc/source/ui/inc/undosort.hxx b/sc/source/ui/inc/undosort.hxx index 83b3a624a111..d44827ffad5e 100644 --- a/sc/source/ui/inc/undosort.hxx +++ b/sc/source/ui/inc/undosort.hxx @@ -17,7 +17,7 @@ namespace sc { class UndoSort : public ScSimpleUndo { - ReorderParam const maParam; + ReorderParam maParam; public: UndoSort( ScDocShell* pDocSh, const ReorderParam& rParam ); diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 20e749f40c20..0e27014fb0cb 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -48,9 +48,9 @@ public: class ScUndoModifyStyle: public ScSimpleUndo { private: - SfxStyleFamily const eFamily; - ScStyleSaveData const aOldData; - ScStyleSaveData const aNewData; + SfxStyleFamily eFamily; + ScStyleSaveData aOldData; + ScStyleSaveData aNewData; static void DoChange( ScDocShell* pDocSh, const OUString& rName, SfxStyleFamily eStyleFamily, @@ -90,13 +90,13 @@ private: struct ApplyStyleEntry { SCTAB mnTab; - OUString const maOldStyle; + OUString maOldStyle; explicit ApplyStyleEntry( SCTAB nTab, const OUString& rOldStyle ); }; typedef ::std::vector< ApplyStyleEntry > ApplyStyleVec; ApplyStyleVec maEntries; - OUString const maNewStyle; + OUString maNewStyle; }; #endif diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index b65298530e28..d9e50709a470 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -53,11 +53,11 @@ public: virtual OUString GetComment() const override; private: - OUString const sNewName; + OUString sNewName; std::unique_ptr<SdrUndoAction> pDrawUndo; - sal_uLong nEndChangeAction; - SCTAB const nTab; - bool const bAppend; + sal_uLong nEndChangeAction; + SCTAB nTab; + bool bAppend; void SetChangeTrack(); }; @@ -82,9 +82,9 @@ private: std::unique_ptr<SdrUndoAction> pDrawUndo; std::vector<OUString> aNameList; - sal_uLong nStartChangeAction; - sal_uLong nEndChangeAction; - SCTAB const nTab; + sal_uLong nStartChangeAction; + sal_uLong nEndChangeAction; + SCTAB nTab; void SetChangeTrack(); }; @@ -132,7 +132,7 @@ public: virtual OUString GetComment() const override; private: - SCTAB const nTab; + SCTAB nTab; OUString sOldName; OUString sNewName; @@ -240,12 +240,12 @@ public: private: std::unique_ptr<ScMarkData> mpMarkData; - SCTAB const nSrcTab; - SCTAB const nDestTab; - OUString const aName; - OUString const aComment; - Color const aColor; - ScScenarioFlags const nFlags; + SCTAB nSrcTab; + SCTAB nDestTab; + OUString aName; + OUString aComment; + Color aColor; + ScScenarioFlags nFlags; std::unique_ptr<SdrUndoAction> pDrawUndo; }; @@ -265,8 +265,8 @@ public: virtual OUString GetComment() const override; private: - SCTAB const nTab; - SCTAB const nCount; + SCTAB nTab; + SCTAB nCount; ScDocumentUniquePtr xRedoDoc; std::unique_ptr<SdrUndoAction> pDrawUndo; @@ -289,7 +289,7 @@ public: virtual OUString GetComment() const override; private: - OUString const aDocName; + OUString aDocName; OUString aFltName; OUString aOptions; sal_uLong nRefreshDelay; @@ -321,8 +321,8 @@ public: virtual OUString GetComment() const override; private: - std::vector<SCTAB> const undoTabs; - bool const bShow; + std::vector<SCTAB> undoTabs; + bool bShow; void DoChange( bool bShow ) const; }; @@ -365,7 +365,7 @@ public: virtual OUString GetComment() const override; private: - SCTAB const mnTab; + SCTAB mnTab; ::std::unique_ptr<ScTableProtection> mpProtectSettings; void DoProtect(bool bProtect); @@ -414,15 +414,15 @@ public: virtual OUString GetComment() const override; private: - SCTAB const nTab; - OUString const aOldName; - OUString const aNewName; - OUString const aOldComment; - OUString const aNewComment; - Color const aOldColor; - Color const aNewColor; - ScScenarioFlags const nOldFlags; - ScScenarioFlags const nNewFlags; + SCTAB nTab; + OUString aOldName; + OUString aNewName; + OUString aOldComment; + OUString aNewComment; + Color aOldColor; + Color aNewColor; + ScScenarioFlags nOldFlags; + ScScenarioFlags nNewFlags; }; class ScUndoRenameObject: public ScSimpleUndo @@ -442,9 +442,9 @@ public: virtual OUString GetComment() const override; private: - OUString const aPersistName; // to find object (works only for OLE objects) - OUString const aOldName; - OUString const aNewName; + OUString aPersistName; // to find object (works only for OLE objects) + OUString aOldName; + OUString aNewName; SdrObject* GetObject(); }; @@ -463,8 +463,8 @@ public: virtual OUString GetComment() const override; private: - SCTAB const nTab; - bool const bRTL; + SCTAB nTab; + bool bRTL; void DoChange( bool bNew ); }; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 314b9ea014a5..bb746f522630 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -98,12 +98,12 @@ private: DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(CheckHdl, weld::Button&, void); - OUString const maStrMin; - OUString const maStrMax; - OUString const maStrValue; - OUString const maStrFormula; - OUString const maStrRange; - OUString const maStrList; + OUString maStrMin; + OUString maStrMax; + OUString maStrValue; + OUString maStrFormula; + OUString maStrRange; + OUString maStrList; sal_Unicode mcFmlaSep; /// List separator in formulas. DECL_LINK( EditSetFocusHdl, formula::RefEdit&, void ); @@ -149,7 +149,7 @@ class ScValidationDlg { typedef ScRefHdlrControllerImpl<SfxTabDialogController, false> ScValidationDlgBase; - ScTabViewShell * const m_pTabVwSh; + ScTabViewShell * m_pTabVwSh; OString m_sValuePageId; bool m_bOwnRefHdlr:1; bool m_bRefInputting:1; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index e5833dec5d32..345f9d9ae00f 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -155,7 +155,7 @@ class ScBoundsProvider typedef ScPositionHelper::value_type value_type; typedef SCCOLROW index_type; - ScDocument* const pDoc; + ScDocument* pDoc; const SCTAB nTab; const bool bColumnHeader; const index_type MAX_INDEX; diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx index 7a3333a64640..279f60215cfc 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -33,7 +33,7 @@ class ScDataProviderBaseControl OUString msApplyTooltip; - Link<ScDataProviderBaseControl*, void> const maImportCallback; + Link<ScDataProviderBaseControl*, void> maImportCallback; DECL_LINK(ProviderSelectHdl, weld::ComboBox&, void); DECL_LINK(IDEditHdl, weld::Entry&, void); @@ -162,9 +162,9 @@ namespace { struct MenuData { - int const nMenuID; + int nMenuID; const char* aMenuName; - std::function<void(ScDataProviderDlg*)> const maCallback; + std::function<void(ScDataProviderDlg*)> maCallback; }; MenuData aStartData[] = { diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 00199541fd0b..1140edfa2c2d 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -98,7 +98,7 @@ private: bool mbSettingToggles : 1; vcl::EnumContext maContext; - SfxBindings* const mpBindings; + SfxBindings* mpBindings; DECL_LINK( MFLeftIndentMdyHdl, weld::MetricSpinButton&, void ); DECL_LINK( CBOXMergnCellClkHdl, weld::ToggleButton&, void ); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 3c2e1cd9dd36..bab8a5c7d175 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -129,7 +129,7 @@ private: bool mbDiagBLTR : 1; vcl::EnumContext maContext; - SfxBindings* const mpBindings; + SfxBindings* mpBindings; DECL_LINK(TbxCellBorderSelectHdl, const OString&, void); DECL_LINK(TbxCellBorderMenuHdl, const OString&, void); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 74eaa1f37a86..d0fbdd7e787a 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -81,7 +81,7 @@ private: sal_Int32 mnCategorySelected; vcl::EnumContext maContext; - SfxBindings* const mpBindings; + SfxBindings* mpBindings; DECL_LINK(NumFormatSelectHdl, weld::ComboBox&, void); DECL_LINK(NumFormatValueHdl, weld::SpinButton&, void); diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index af8115f286ee..c9a9173c5193 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -103,7 +103,7 @@ namespace { private: ScDocument& m_rDoc; - bool const m_bUndoEnabled; + bool m_bUndoEnabled; public: explicit DisableUndoGuard(ScDocShell *pDocShell) : m_rDoc(pDocShell->GetDocument()) diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index c60ed2332040..9259de5f9c7a 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -69,7 +69,7 @@ namespace calc ::comphelper::OInterfaceContainerHelper2 m_aModifyListeners; /// our modify listeners bool m_bInitialized; /// has XInitialization::initialize been called? - bool const m_bListPos; /// constructed as ListPositionCellBinding? + bool m_bListPos; /// constructed as ListPositionCellBinding? public: OCellValueBinding( diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 01dfcdbc2ed6..03787f78009b 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -490,7 +490,7 @@ private: GlueType meGlue; SCCOL mnStartCol; SCROW mnStartRow; - ScDocument* const mpDoc; + ScDocument* mpDoc; bool mbColHeaders:1; bool mbRowHeaders:1; bool mbDummyUpperLeft:1; @@ -1325,7 +1325,7 @@ bool lcl_addUpperLeftCornerIfMissing(const ScDocument* pDoc, vector<ScTokenRef>& class ShrinkRefTokenToDataRange { - ScDocument* const mpDoc; + ScDocument* mpDoc; public: explicit ShrinkRefTokenToDataRange(ScDocument* pDoc) : mpDoc(pDoc) {} void operator() (const ScTokenRef& rRef) diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index 692e3a9591a6..6f9a25fcca89 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -76,8 +76,8 @@ const SfxItemPropertyMapEntry* getConditionEntryrPropSet() struct ConditionEntryApiMap { - ScConditionMode const eMode; - sal_Int32 const nApiMode; + ScConditionMode eMode; + sal_Int32 nApiMode; }; static ConditionEntryApiMap const aConditionEntryMap[] = @@ -127,8 +127,8 @@ const SfxItemPropertyMapEntry* getColorScalePropSet() struct ColorScaleEntryTypeApiMap { - ScColorScaleEntryType const eType; - sal_Int32 const nApiType; + ScColorScaleEntryType eType; + sal_Int32 nApiType; }; static ColorScaleEntryTypeApiMap const aColorScaleEntryTypeMap[] = @@ -176,8 +176,8 @@ const SfxItemPropertyMapEntry* getDataBarPropSet() struct DataBarAxisApiMap { - databar::ScAxisPosition const ePos; - sal_Int32 const nApiPos; + databar::ScAxisPosition ePos; + sal_Int32 nApiPos; }; static DataBarAxisApiMap const aDataBarAxisMap[] = @@ -189,8 +189,8 @@ static DataBarAxisApiMap const aDataBarAxisMap[] = struct DataBarEntryTypeApiMap { - ScColorScaleEntryType const eType; - sal_Int32 const nApiType; + ScColorScaleEntryType eType; + sal_Int32 nApiType; }; static DataBarEntryTypeApiMap const aDataBarEntryTypeMap[] = @@ -227,8 +227,8 @@ const SfxItemPropertyMapEntry* getIconSetPropSet() struct IconSetTypeApiMap { - ScIconSetType const eType; - sal_Int32 const nApiType; + ScIconSetType eType; + sal_Int32 nApiType; }; const IconSetTypeApiMap aIconSetApiMap[] = @@ -256,8 +256,8 @@ const IconSetTypeApiMap aIconSetApiMap[] = struct IconSetEntryTypeApiMap { - ScColorScaleEntryType const eType; - sal_Int32 const nApiType; + ScColorScaleEntryType eType; + sal_Int32 nApiType; }; static IconSetEntryTypeApiMap const aIconSetEntryTypeMap[] = @@ -288,8 +288,8 @@ const SfxItemPropertyMapEntry* getCondDatePropSet() struct DateTypeApiMap { - condformat::ScCondFormatDateType const eType; - sal_Int32 const nApiType; + condformat::ScCondFormatDateType eType; + sal_Int32 nApiType; }; static DateTypeApiMap const aDateTypeApiMap[] = diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index d6adc7611576..3d7774e40944 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -394,7 +394,7 @@ class SequencesContainer long& mrDocRow; bool mbOverflow; bool mbArgError; - ScDocument* const mpDoc; + ScDocument* mpDoc; ScTokenArray& mrTokenArr; public: diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index b0173e1904f6..3a009a977bef 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -247,7 +247,7 @@ using Type = ScServiceProvider::Type; struct ProvNamesId_Type { const char * pName; - ScServiceProvider::Type const nType; + ScServiceProvider::Type nType; }; const ProvNamesId_Type aProvNamesId[] = diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 3d7605d446d0..fa7afe05c6e0 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -1323,7 +1323,7 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper< container::XNameReplace > { private: - ScShapeObj* const mpShape; + ScShapeObj* mpShape; ScMacroInfo* getInfo( bool bCreate ) { diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index 93b92552f36a..88004a31514b 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -30,7 +30,7 @@ class ScVbaAxis : public ScVbaAxis_BASE css::uno::Reference< ov::excel::XChart > moChartParent; css::uno::Reference< css::beans::XPropertySet > mxPropertySet; sal_Int32 mnType; - sal_Int32 const mnGroup; + sal_Int32 mnGroup; bool bCrossesAreCustomized; /// @throws css::uno::RuntimeException ScVbaChart* getChartPtr(); diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 406cea8a410b..35abba15ae12 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -55,7 +55,7 @@ class ScVbaBorder : public ScVbaBorder_Base { private: uno::Reference< beans::XPropertySet > m_xProps; - sal_Int32 const m_LineType; + sal_Int32 m_LineType; ScVbaPalette m_Palette; void setBorderLine( const table::BorderLine& rBorderLine ) { diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 1c7d34d06a23..9a7bd69229f2 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -32,9 +32,9 @@ class ScVbaCharacters : public ScVbaCharacters_BASE private: css::uno::Reference< css::text::XTextRange > m_xTextRange; css::uno::Reference< css::text::XSimpleText > m_xSimpleText; - ScVbaPalette const m_aPalette; + ScVbaPalette m_aPalette; // Add because of MSO has different behavior. - bool const bReplace; + bool bReplace; public: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 5b165c21635e..2bb6b2be5285 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -176,7 +176,7 @@ private: ::osl::Mutex maMutex; ScVbaEventsHelper& mrVbaEvents; uno::Reference< frame::XModel > mxModel; - ScDocShell* const mpDocShell; + ScDocShell* mpDocShell; WindowControllerMap maControllers; /// Maps VCL top windows to their controllers. std::multiset< VclPtr<vcl::Window> > m_PostedWindows; /// Keeps processWindowResizeEvent windows from being deleted between postWindowResizeEvent and processWindowResizeEvent VclPtr<vcl::Window> mpActiveWindow; /// Currently activated window, to prevent multiple (de)activation. diff --git a/sc/source/ui/vba/vbafiledialog.hxx b/sc/source/ui/vba/vbafiledialog.hxx index 0596e640fb60..68b6288df685 100644 --- a/sc/source/ui/vba/vbafiledialog.hxx +++ b/sc/source/ui/vba/vbafiledialog.hxx @@ -33,7 +33,7 @@ typedef InheritedHelperInterfaceWeakImpl< ov::excel::XFileDialog > ScVbaFileDial class ScVbaFileDialog : public ScVbaFileDialog_BASE { private: - sal_Int32 const m_nType; + sal_Int32 m_nType; OUString m_sTitle; OUString m_sInitialFileName; css::uno::Reference< ov::excel::XFileDialogSelectedItems> m_xItems; diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index 4eac5d4b885d..9b0a1cf9c369 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -34,7 +34,7 @@ typedef cppu::ImplInheritanceHelper< VbaFontBase, ov::excel::XFont > ScVbaFont_B class ScVbaFont : public ScVbaFont_BASE { - ScCellRangeObj* const mpRangeObj; + ScCellRangeObj* mpRangeObj; SfxItemSet* GetDataSet(); public: /// @throws css::uno::RuntimeException diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index 3805be38c19e..a13f6186a854 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -38,7 +38,7 @@ template< typename... Ifc > class ScVbaFormat : public InheritedHelperInterfaceWeakImpl< Ifc... > { typedef InheritedHelperInterfaceWeakImpl< Ifc... > ScVbaFormat_BASE; - css::lang::Locale const m_aDefaultLocale; + css::lang::Locale m_aDefaultLocale; protected: css::uno::Reference< css::beans::XPropertySet > mxPropertySet; css::uno::Reference< css::util::XNumberFormatsSupplier > mxNumberFormatsSupplier; @@ -46,7 +46,7 @@ protected: css::uno::Reference< css::util::XNumberFormatTypes > xNumberFormatTypes; css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::beans::XPropertyState > xPropertyState; - bool const mbCheckAmbiguoity; + bool mbCheckAmbiguoity; bool mbAddIndent; /// @throws css::script::BasicErrorException bool isAmbiguous(const OUString& _sPropertyName); diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index f6cec8345710..a1d7307f1a1d 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -52,7 +52,7 @@ struct EqualAnchorFunctor { uno::Reference< excel::XRange > mxAnchorRange; uno::Reference< msforms::XShape > mxAnchorShape; - sal_Int32 const mnType; + sal_Int32 mnType; /// @throws uno::RuntimeException explicit EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ); /// @throws uno::RuntimeException diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 00c0c93e6682..c06675ee28bb 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -36,7 +36,7 @@ typedef InheritedHelperInterfaceWeakImpl< ov::excel::XInterior > ScVbaInterior_B class ScVbaInterior final : public ScVbaInterior_BASE { css::uno::Reference< css::beans::XPropertySet > m_xProps; - ScDocument* const m_pScDoc; + ScDocument* m_pScDoc; Color m_aPattColor; sal_Int32 m_nPattern; diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 6fafa9ec1420..fff5924960a5 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -37,7 +37,7 @@ private: uno::Reference< XHelperInterface > mxParent; uno::Reference< uno::XComponentContext > mxContext; uno::Reference< sheet::XSheetPageBreak > mxSheetPageBreak; - bool const m_bColumn; + bool m_bColumn; public: RangePageBreaks( const uno::Reference< XHelperInterface >& xParent, diff --git a/sc/source/ui/vba/vbapalette.hxx b/sc/source/ui/vba/vbapalette.hxx index c556578a3955..546e6973de58 100644 --- a/sc/source/ui/vba/vbapalette.hxx +++ b/sc/source/ui/vba/vbapalette.hxx @@ -32,7 +32,7 @@ class SfxObjectShell; class ScVbaPalette { private: - SfxObjectShell* const m_pShell; + SfxObjectShell* m_pShell; public: explicit ScVbaPalette( SfxObjectShell* pShell ) : m_pShell( pShell ) {} explicit ScVbaPalette( const css::uno::Reference< css::frame::XModel >& rxModel ); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index dc908cbaf354..403ea1c2f1d5 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -317,8 +317,8 @@ public: class RangesEnumerationImpl : public EnumerationHelperImpl { - bool const mbIsRows; - bool const mbIsColumns; + bool mbIsRows; + bool mbIsColumns; public: /// @throws uno::RuntimeException RangesEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} @@ -330,8 +330,8 @@ public: class ScVbaRangeAreas : public ScVbaCollectionBaseImpl { - bool const mbIsRows; - bool const mbIsColumns; + bool mbIsRows; + bool mbIsColumns; public: ScVbaRangeAreas( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, bool bIsRows, bool bIsColumns ) : ScVbaCollectionBaseImpl( xParent, xContext, xIndexAccess ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} @@ -577,9 +577,9 @@ public: struct CellPos { CellPos( sal_Int32 nRow, sal_Int32 nCol, sal_Int32 nArea ):m_nRow(nRow), m_nCol(nCol), m_nArea( nArea ) {}; -sal_Int32 const m_nRow; -sal_Int32 const m_nCol; -sal_Int32 const m_nArea; +sal_Int32 m_nRow; +sal_Int32 m_nCol; +sal_Int32 m_nArea; }; } @@ -597,7 +597,7 @@ namespace { class ColumnsRowEnumeration: public CellsEnumeration_BASE { uno::Reference< excel::XRange > mxRange; - sal_Int32 const mMaxElems; + sal_Int32 mMaxElems; sal_Int32 mCurElem; public: @@ -688,7 +688,7 @@ namespace { class CellValueSetter : public ValueSetter { protected: - uno::Any const maValue; + uno::Any maValue; public: explicit CellValueSetter( const uno::Any& aValue ); virtual bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) override; @@ -858,8 +858,8 @@ namespace { class CellFormulaValueSetter : public CellValueSetter { private: - ScDocument* const m_pDoc; - formula::FormulaGrammar::Grammar const m_eGrammar; + ScDocument* m_pDoc; + formula::FormulaGrammar::Grammar m_eGrammar; public: CellFormulaValueSetter( const uno::Any& aValue, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ):CellValueSetter( aValue ), m_pDoc( pDoc ), m_eGrammar( eGram ){} protected: @@ -907,8 +907,8 @@ protected: class CellFormulaValueGetter : public CellValueGetter { private: - ScDocument* const m_pDoc; - formula::FormulaGrammar::Grammar const m_eGrammar; + ScDocument* m_pDoc; + formula::FormulaGrammar::Grammar m_eGrammar; public: CellFormulaValueGetter(ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ) : CellValueGetter( ), m_pDoc( pDoc ), m_eGrammar( eGram ) {} virtual void visitNode( sal_Int32 /*x*/, sal_Int32 /*y*/, const uno::Reference< table::XCell >& xCell ) override diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 2e91dbf1a892..baa62f91136a 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -75,8 +75,8 @@ class ScVbaRange : public ScVbaRange_BASE css::uno::Reference< ov::XCollection > m_Borders; css::uno::Reference< css::table::XCellRange > mxRange; css::uno::Reference< css::sheet::XSheetCellRangeContainer > mxRanges; - bool const mbIsRows; - bool const mbIsColumns; + bool mbIsRows; + bool mbIsColumns; css::uno::Reference< ov::excel::XValidation > m_xValidation; /// @throws css::uno::RuntimeException double getCalcColWidth(const css::table::CellRangeAddress&); diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 94d88fbb416b..244ea5bd18f8 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -71,7 +71,7 @@ private: void setFullString( const OUString& rString ); private: - ScVbaPalette const maPalette; + ScVbaPalette maPalette; css::uno::Reference< css::beans::XPropertySet > mxPropSet; sal_Int32 mnStart; sal_Int32 mnLength; @@ -122,7 +122,7 @@ protected: virtual void implSetDefaultProperties(); protected: - ScVbaPalette const maPalette; + ScVbaPalette maPalette; css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::drawing::XShape > mxShape; css::uno::Reference< css::beans::XPropertySet > mxShapeProps; diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 672c638c37c1..74da487f8518 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -393,7 +393,7 @@ protected: protected: uno::Reference< container::XIndexContainer > mxFormIC; - OUString const maModelServiceName; + OUString maModelServiceName; sal_Int16 /* css::form::FormComponentType */ meType; }; diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index a6b99ac962ec..6d1c1adf9e01 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -38,7 +38,7 @@ typedef InheritedHelperInterfaceImpl< Ifc... > BaseClass; css::uno::Reference< css::drawing::XShape > xTitleShape; css::uno::Reference< css::beans::XPropertySet > xShapePropertySet; std::unique_ptr<ov::ShapeHelper> oShapeHelper; - ScVbaPalette const m_Palette; + ScVbaPalette m_Palette; public: TitleImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 26f621eb2330..45f215eea41d 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -101,7 +101,7 @@ public: class WindowEnumImpl : public WindowComponentEnumImpl { - uno::Any const m_aApplication; + uno::Any m_aApplication; public: WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ): WindowComponentEnumImpl( xContext ), m_aApplication( aApplication ) {} virtual uno::Any SAL_CALL nextElement( ) override diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 2ca08843fd42..0093c96820f6 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -1623,7 +1623,7 @@ namespace { struct ScOUStringCollate { - CollatorWrapper* const mpCollator; + CollatorWrapper* mpCollator; explicit ScOUStringCollate(CollatorWrapper* pColl) : mpCollator(pColl) {} diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index aca511f7fd51..178f43c45f24 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -273,7 +273,7 @@ public: class CopyRangeData { ScDocument* mpSrc; - ScDocument* const mpDest; + ScDocument* mpDest; public: CopyRangeData(ScDocument* pSrc, ScDocument* pDest) : mpSrc(pSrc), mpDest(pDest) {} diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 969136b777b3..44096e0c7f43 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -190,13 +190,13 @@ class ScFilterListBox : public ListBox { private: VclPtr<ScGridWindow> pGridWin; - SCCOL const nCol; - SCROW const nRow; + SCCOL nCol; + SCROW nRow; bool bInit; bool bCancelled; bool bInSelect; sal_uLong nSel; - ScFilterBoxMode const eMode; + ScFilterBoxMode eMode; protected: void SelectHdl(); @@ -560,7 +560,7 @@ struct AutoFilterData : public ScCheckListMenuWindow::ExtendedData class AutoFilterAction : public ScMenuFloatingWindow::Action { VclPtr<ScGridWindow> mpWindow; - ScGridWindow::AutoFilterMode const meMode; + ScGridWindow::AutoFilterMode meMode; public: AutoFilterAction(ScGridWindow* p, ScGridWindow::AutoFilterMode eMode) : mpWindow(p), meMode(eMode) {} @@ -573,7 +573,7 @@ public: class AutoFilterPopupEndAction : public ScMenuFloatingWindow::Action { VclPtr<ScGridWindow> mpWindow; - ScAddress const maPos; + ScAddress maPos; public: AutoFilterPopupEndAction(ScGridWindow* p, const ScAddress& rPos) : mpWindow(p), maPos(rPos) {} diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 3f99c3d193bb..134a6f4734ed 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -424,9 +424,9 @@ public: } private: - ScDPObject* const mpDPObject; - long const mnDimIndex; - SortType const meType; + ScDPObject* mpDPObject; + long mnDimIndex; + SortType meType; sal_uInt16 mnUserListIndex; ScTabViewShell* mpViewShell; }; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 4286f2a36d43..141062fd19ca 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -118,7 +118,7 @@ class ScDrawStringsVars bool bRepeat; bool bShrink; - bool const bPixelToLogic; + bool bPixelToLogic; bool bCellContrast; Color aBackConfigColor; // used for ScPatternAttr::GetFont calls @@ -2779,7 +2779,7 @@ public: private: tools::Rectangle maRect; VclPtr<OutputDevice> mpDev; - bool const mbMetaFile; + bool mbMetaFile; }; // Returns needed width in current units; sets rNeededPixel to needed width in pixels diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 2c00bf260cd1..e96d3bd79452 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -42,11 +42,11 @@ enum ScPreviewLocationType struct ScPreviewLocationEntry { - ScPreviewLocationType const eType; - tools::Rectangle const aPixelRect; - ScRange const aCellRange; - bool const bRepeatCol; - bool const bRepeatRow; + ScPreviewLocationType eType; + tools::Rectangle aPixelRect; + ScRange aCellRange; + bool bRepeatCol; + bool bRepeatRow; ScPreviewLocationEntry( ScPreviewLocationType eNewType, const tools::Rectangle& rPixel, const ScRange& rRange, bool bRepCol, bool bRepRow ) : diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 545fce092934..157ab4967484 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -98,7 +98,7 @@ namespace { class PopupCallback : public cppu::WeakImplHelper<css::awt::XCallback> { ScTabViewShell* m_pViewShell; - SdrOle2Obj* const m_pObject; + SdrOle2Obj* m_pObject; public: explicit PopupCallback(ScTabViewShell* pViewShell, SdrOle2Obj* pObject) |