diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-11 10:46:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-15 07:56:12 +0200 |
| commit | fb1d3b580763a333bbbfe115d09e1b5cd8849675 (patch) | |
| tree | 93cf0598c86ba188f69ab30425ffea856ea9886b /sc/source/ui | |
| parent | 40bc840da261fcc5652e5278dc2566b61f990884 (diff) | |
loplugin:constfields in sc
Change-Id: If326175d571d15752efd1b63df45b2bc785f7541
Reviewed-on: https://gerrit.libreoffice.org/61653
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui')
137 files changed, 661 insertions, 662 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index ace156f82e9a..6966e9ac9428 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -110,13 +110,9 @@ ScAccessibleShapeData::~ScAccessibleShapeData() struct ScShapeDataLess { - OUString msLayerId; - OUString msZOrder; - ScShapeDataLess() - : msLayerId( "LayerID" ), - msZOrder( "ZOrder" ) - { - } + static constexpr OUStringLiteral gsLayerId = "LayerID"; + static constexpr OUStringLiteral gsZOrder = "ZOrder"; + static void ConvertLayerId(sal_Int16& rLayerID) // changes the number of the LayerId so it the accessibility order { // note: MSVC 2017 ICE's if this is written as "switch" so use "if" @@ -137,13 +133,13 @@ struct ScShapeDataLess rLayerID = 3; } } - bool LessThanSheet(const ScAccessibleShapeData* pData) const + static bool LessThanSheet(const ScAccessibleShapeData* pData) { bool bResult(false); uno::Reference< beans::XPropertySet> xProps(pData->xShape, uno::UNO_QUERY); if (xProps.is()) { - uno::Any aPropAny = xProps->getPropertyValue(msLayerId); + uno::Any aPropAny = xProps->getPropertyValue(gsLayerId); sal_Int16 nLayerID = 0; if( aPropAny >>= nLayerID ) { @@ -162,17 +158,17 @@ struct ScShapeDataLess uno::Reference< beans::XPropertySet> xProps2(pData2->xShape, uno::UNO_QUERY); if (xProps1.is() && xProps2.is()) { - uno::Any aPropAny1 = xProps1->getPropertyValue(msLayerId); - uno::Any aPropAny2 = xProps2->getPropertyValue(msLayerId); + uno::Any aPropAny1 = xProps1->getPropertyValue(gsLayerId); + uno::Any aPropAny2 = xProps2->getPropertyValue(gsLayerId); sal_Int16 nLayerID1(0); sal_Int16 nLayerID2(0); if( (aPropAny1 >>= nLayerID1) && (aPropAny2 >>= nLayerID2) ) { if (nLayerID1 == nLayerID2) { - uno::Any aAny1 = xProps1->getPropertyValue(msZOrder); + uno::Any aAny1 = xProps1->getPropertyValue(gsZOrder); sal_Int32 nZOrder1 = 0; - uno::Any aAny2 = xProps2->getPropertyValue(msZOrder); + uno::Any aAny2 = xProps2->getPropertyValue(gsZOrder); sal_Int32 nZOrder2 = 0; if ( (aAny1 >>= nZOrder1) && (aAny2 >>= nZOrder2) ) bResult = (nZOrder1 < nZOrder2); @@ -196,6 +192,11 @@ struct ScShapeDataLess } }; +#if !HAVE_CPP_INLINE_VARIABLES +constexpr OUStringLiteral ScShapeDataLess::gsLayerId; +constexpr OUStringLiteral ScShapeDataLess::gsZOrder; +#endif + struct DeselectShape { void operator() (const ScAccessibleShapeData* pAccShapeData) const @@ -297,7 +298,7 @@ private: mutable sal_uInt32 mnShapesSelected; ScTabViewShell* mpViewShell; ScAccessibleDocument* mpAccessibleDocument; - ScSplitPos meSplitPos; + ScSplitPos const 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 84cdfe7df845..8fe872f73da4 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -97,7 +97,7 @@ public: private: ScPreviewShell* mpViewShell; - ScAccessibleDocumentPagePreview* mpAccDoc; + ScAccessibleDocumentPagePreview* const mpAccDoc; typedef std::vector<ScAccNote> ScAccNotes; mutable ScAccNotes maNotes; mutable ScAccNotes maMarks; @@ -258,7 +258,7 @@ uno::Reference<XAccessible> ScNotesChildren::GetChild(sal_Int32 nIndex) const struct ScPointFound { - tools::Rectangle maPoint; + tools::Rectangle const maPoint; sal_Int32 mnParagraphs; explicit ScPointFound(const Point& rPoint) : maPoint(rPoint, Size(0, 0)), mnParagraphs(0) {} bool operator() (const ScAccNote& rNote) @@ -416,7 +416,7 @@ sal_Int32 ScNotesChildren::CheckChanges(const ScPreviewLocationData& rData, struct ScChildGone { - ScAccessibleDocumentPagePreview* mpAccDoc; + ScAccessibleDocumentPagePreview* const mpAccDoc; explicit ScChildGone(ScAccessibleDocumentPagePreview* pAccDoc) : mpAccDoc(pAccDoc) {} void operator() (const uno::Reference<XAccessible>& xAccessible) const { @@ -434,7 +434,7 @@ struct ScChildGone struct ScChildNew { - ScAccessibleDocumentPagePreview* mpAccDoc; + ScAccessibleDocumentPagePreview* const mpAccDoc; explicit ScChildNew(ScAccessibleDocumentPagePreview* pAccDoc) : mpAccDoc(pAccDoc) {} void operator() (const uno::Reference<XAccessible>& xAccessible) const { @@ -635,7 +635,7 @@ public: void SetDrawBroadcaster(); private: - ScAccessibleDocumentPagePreview* mpAccDoc; + ScAccessibleDocumentPagePreview* const mpAccDoc; ScPreviewShell* mpViewShell; ScShapeRangeVec maShapeRanges; @@ -927,7 +927,7 @@ uno::Reference<XAccessible> ScShapeChildren::GetControl(sal_Int32 nIndex) const struct ScShapePointFound { - Point maPoint; + Point const 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 79de53138b64..2edec7eb6391 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -72,7 +72,7 @@ public: } private: Reference<XAccessibleEventListener> mxListener; - bool mbAdd; + bool const mbAdd; }; } diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index a38b609a3b1c..ecb5622c9319 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -93,7 +93,6 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl sal_uInt16 mnCurrentZoom; sal_uInt16 mnMinZoom; sal_uInt16 mnMaxZoom; - sal_uInt16 mnSliderCenter; std::vector< long > maSnappingPointOffsets; std::vector< sal_uInt16 > maSnappingPointZooms; Image maSliderButton; @@ -105,7 +104,6 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl mnCurrentZoom( nCurrentZoom ), mnMinZoom( 10 ), mnMaxZoom( 400 ), - mnSliderCenter( 100 ), maSnappingPointOffsets(), maSnappingPointZooms(), maSliderButton(), @@ -116,6 +114,8 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl } }; +static constexpr sal_uInt16 gnSliderCenter(100); + const long nButtonWidth = 10; const long nButtonHeight = 10; const long nIncDecWidth = 11; @@ -160,7 +160,7 @@ sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const if( nOffset < nControlWidth / 2 ) { // first half of slider - const long nFirstHalfRange = mpImpl->mnSliderCenter - mpImpl->mnMinZoom; + const long nFirstHalfRange = gnSliderCenter - mpImpl->mnMinZoom; const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset; const long nZoomPerSliderPixel = (1000 * nFirstHalfRange) / nHalfSliderWidth; const long nOffsetToSliderLeft = nOffset - nSliderXOffset; @@ -169,11 +169,11 @@ sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const else { // second half of slider - const long nSecondHalfRange = mpImpl->mnMaxZoom - mpImpl->mnSliderCenter; + const long nSecondHalfRange = mpImpl->mnMaxZoom - gnSliderCenter; const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset; const long nZoomPerSliderPixel = 1000 * nSecondHalfRange / nHalfSliderWidth; const long nOffsetToSliderCenter = nOffset - nControlWidth/2; - nRet = mpImpl->mnSliderCenter + sal_uInt16( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 ); + nRet = gnSliderCenter + sal_uInt16( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 ); } } @@ -193,18 +193,18 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const long nRect = nSliderXOffset; const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset; - if( nCurrentZoom <= mpImpl->mnSliderCenter ) + if( nCurrentZoom <= gnSliderCenter ) { nCurrentZoom = nCurrentZoom - mpImpl->mnMinZoom; - const long nFirstHalfRange = mpImpl->mnSliderCenter - mpImpl->mnMinZoom; + const long nFirstHalfRange = gnSliderCenter - mpImpl->mnMinZoom; const long nSliderPixelPerZoomPercent = 1000 * nHalfSliderWidth / nFirstHalfRange; const long nOffset = (nSliderPixelPerZoomPercent * nCurrentZoom) / 1000; nRect += nOffset; } else { - nCurrentZoom = nCurrentZoom - mpImpl->mnSliderCenter; - const long nSecondHalfRange = mpImpl->mnMaxZoom - mpImpl->mnSliderCenter; + nCurrentZoom = nCurrentZoom - gnSliderCenter; + const long nSecondHalfRange = mpImpl->mnMaxZoom - gnSliderCenter; const long nSliderPixelPerZoomPercent = 1000 * nHalfSliderWidth / nSecondHalfRange; const long nOffset = (nSliderPixelPerZoomPercent * nCurrentZoom) / 1000; nRect += nHalfSliderWidth + nOffset; @@ -338,9 +338,9 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) mpImpl->mnMaxZoom = pZoomSliderItem->GetMaxZoom(); OSL_ENSURE( mpImpl->mnMinZoom <= mpImpl->mnCurrentZoom && - mpImpl->mnMinZoom < mpImpl->mnSliderCenter && + mpImpl->mnMinZoom < gnSliderCenter && mpImpl->mnMaxZoom >= mpImpl->mnCurrentZoom && - mpImpl->mnMaxZoom > mpImpl->mnSliderCenter, + mpImpl->mnMaxZoom > gnSliderCenter, "Looks like the zoom slider item is corrupted" ); const css::uno::Sequence < sal_Int32 > rSnappingPoints = pZoomSliderItem->GetSnappingPoints(); mpImpl->maSnappingPointOffsets.clear(); diff --git a/sc/source/ui/dataprovider/dataprovider.cxx b/sc/source/ui/dataprovider/dataprovider.cxx index 6a7016fd43f6..8c13add177e4 100644 --- a/sc/source/ui/dataprovider/dataprovider.cxx +++ b/sc/source/ui/dataprovider/dataprovider.cxx @@ -63,7 +63,6 @@ ExternalDataSource::ExternalDataSource(const OUString& rURL, const OUString& rProvider, ScDocument* pDoc) : maURL(rURL) , maProvider(rProvider) - , mnUpdateFrequency(0.0) , mpDoc(pDoc) { } @@ -136,7 +135,7 @@ void ExternalDataSource::setDBData(const OUString& rDBName) double ExternalDataSource::getUpdateFrequency() const { - return mnUpdateFrequency; + return 0; } ScDBDataManager* ExternalDataSource::getDBManager() diff --git a/sc/source/ui/dataprovider/htmldataprovider.cxx b/sc/source/ui/dataprovider/htmldataprovider.cxx index b83a046f0d36..d5b1903d93ff 100644 --- a/sc/source/ui/dataprovider/htmldataprovider.cxx +++ b/sc/source/ui/dataprovider/htmldataprovider.cxx @@ -25,10 +25,10 @@ namespace sc { class HTMLFetchThread : public salhelper::Thread { ScDocument& mrDocument; - OUString maURL; - OUString maID; + OUString const maURL; + OUString const maID; const std::vector<std::shared_ptr<sc::DataTransformation>> maDataTransformations; - std::function<void()> maImportFinishedHdl; + std::function<void()> const 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 7589b28b37a5..ae211850c9a3 100644 --- a/sc/source/ui/dataprovider/htmldataprovider.hxx +++ b/sc/source/ui/dataprovider/htmldataprovider.hxx @@ -21,7 +21,7 @@ class HTMLDataProvider : public DataProvider { private: - ScDocument* mpDocument; + ScDocument* const mpDocument; rtl::Reference<HTMLFetchThread> mxHTMLFetchThread; ScDocumentUniquePtr mpDoc; diff --git a/sc/source/ui/dataprovider/xmldataprovider.cxx b/sc/source/ui/dataprovider/xmldataprovider.cxx index 95c5e467e1f2..67bd92e3ddad 100644 --- a/sc/source/ui/dataprovider/xmldataprovider.cxx +++ b/sc/source/ui/dataprovider/xmldataprovider.cxx @@ -23,12 +23,12 @@ namespace sc class XMLFetchThread : public salhelper::Thread { ScDocument& mrDocument; - OUString maURL; - OUString maID; + OUString const maURL; + OUString const maID; ScOrcusImportXMLParam maParam; std::unique_ptr<ScOrcusXMLContext> mpXMLContext; const std::vector<std::shared_ptr<sc::DataTransformation>> maDataTransformations; - std::function<void()> maImportFinishedHdl; + std::function<void()> const 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 286d6aa120c2..fef995522019 100644 --- a/sc/source/ui/dataprovider/xmldataprovider.hxx +++ b/sc/source/ui/dataprovider/xmldataprovider.hxx @@ -20,7 +20,7 @@ class DataTransformation; class XMLDataProvider : public DataProvider { private: - ScDocument* mpDocument; + ScDocument* const mpDocument; rtl::Reference<XMLFetchThread> mxXMLFetchThread; ScDocumentUniquePtr mpDoc; diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index f5b63fd3a48f..bff66aa2609e 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -47,7 +47,7 @@ struct Func_SetType { - sal_Int32 mnType; + sal_Int32 const mnType; explicit Func_SetType( sal_Int32 nType ) : mnType( nType ) {} void operator()( ScCsvColState& rState ) const { rState.mnType = mnType; } @@ -55,7 +55,7 @@ struct Func_SetType struct Func_Select { - bool mbSelect; + bool const mbSelect; explicit Func_Select( bool bSelect ) : mbSelect( bSelect ) {} void operator()( ScCsvColState& rState ) const { rState.Select( mbSelect ); } diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index ac3293403fd5..cddaf40e997b 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -285,6 +285,8 @@ static void lcl_SaveSeparators( aItem.PutProperties(aNames, aValues); } +static constexpr OUStringLiteral gaTextSepList(SCSTR_TEXTSEP); + ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) : ModalDialog (pParent, "TextImportCsvDialog", @@ -294,7 +296,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa mnRowPosCount(0), - aTextSepList(SCSTR_TEXTSEP), mcTextSep ( ScAsciiOptions::cDefaultTextSep ), meCall(eCall), mbDetectSpaceSep(eCall != SC_TEXTTOCOLUMNS) @@ -431,7 +432,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa pNfRow->SetModifyHdl( LINK( this, ScImportAsciiDlg, FirstRowHdl ) ); // *** Separator characters *** - lcl_FillCombo( *pCbTextSep, aTextSepList, mcTextSep ); + lcl_FillCombo( *pCbTextSep, gaTextSepList, mcTextSep ); pCbTextSep->SetText( sTextSeparators ); Link<Edit&,void> aSeparatorHdl = LINK( this, ScImportAsciiDlg, SeparatorEditHdl ); @@ -646,7 +647,7 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt ) rOpt.SetFieldSeps( GetSeparators() ); rOpt.SetMergeSeps( pCkbAsOnce->IsChecked() ); rOpt.SetRemoveSpace( pCkbRemoveSpace->IsChecked() ); - rOpt.SetTextSep( lcl_CharFromCombo( *pCbTextSep, aTextSepList ) ); + rOpt.SetTextSep( lcl_CharFromCombo( *pCbTextSep, gaTextSepList ) ); } rOpt.SetQuotedAsText(pCkbQuotedAsText->IsChecked()); @@ -776,7 +777,7 @@ void ScImportAsciiDlg::SeparatorHdl( const Control* pCtrl ) OUString aOldFldSeps( maFieldSeparators); maFieldSeparators = GetSeparators(); sal_Unicode cOldSep = mcTextSep; - mcTextSep = lcl_CharFromCombo( *pCbTextSep, aTextSepList ); + mcTextSep = lcl_CharFromCombo( *pCbTextSep, gaTextSepList ); // Any separator changed may result in completely different lines due to // embedded line breaks. if (cOldSep != mcTextSep || aOldFldSeps != maFieldSeparators) diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index a60ef3f4aaf7..d7db2e4a7d5a 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -33,7 +33,7 @@ namespace { class FindByRange { - ScRange maRange; + ScRange const 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 mnTimeout; + sal_uLong const 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 698d99e3e55f..bbbed185ef35 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -54,7 +54,7 @@ double getNow() class CSVHandler { DataStream::Line& mrLine; - size_t mnColCount; + size_t const mnColCount; size_t mnCols; const char* mpLineHead; @@ -96,7 +96,7 @@ namespace datastreams { class ReaderThread : public salhelper::Thread { std::unique_ptr<SvStream> mpStream; - size_t mnColCount; + size_t const mnColCount; bool mbTerminate; osl::Mutex maMtxTerminate; diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 02eb818caaf7..dbc9ce389f37 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1043,8 +1043,8 @@ void ScDocFunc::NotifyInputHandler( const ScAddress& rPos ) struct ScMyRememberItem { - sal_Int32 nIndex; - SfxItemSet aItemSet; + sal_Int32 const nIndex; + SfxItemSet const 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 0bdcc03534d0..e38ad8ad94e3 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -35,7 +35,7 @@ namespace sc { struct DocumentLinkManagerImpl { - SfxObjectShell* mpShell; + SfxObjectShell* const 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 94b582556564..6085573db08b 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -97,7 +97,7 @@ public: } private: - OUString maSearchName; + OUString const maSearchName; }; class FindSrcFileByName @@ -128,8 +128,8 @@ public: p->notify(mnFileId, meType); } private: - sal_uInt16 mnFileId; - ScExternalRefManager::LinkUpdateType meType; + sal_uInt16 const mnFileId; + ScExternalRefManager::LinkUpdateType const meType; }; struct UpdateFormulaCell @@ -164,7 +164,7 @@ public: r.second.erase(mpCell); } private: - ScFormulaCell* mpCell; + ScFormulaCell* const mpCell; }; class ConvertFormulaToStatic @@ -2819,7 +2819,7 @@ class RefCacheFiller : public sc::ColumnSpanSet::ColumnAction ScExternalRefCache& mrRefCache; ScExternalRefCache::TableTypeRef mpRefTab; - sal_uInt16 mnFileId; + sal_uInt16 const mnFileId; ScColumn* mpCurCol; sc::ColumnBlockConstPosition maBlockPos; diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx index 3a289dd1db87..3b47217d6fbf 100644 --- a/sc/source/ui/inc/AccessibilityHints.hxx +++ b/sc/source/ui/inc/AccessibilityHints.hxx @@ -38,7 +38,7 @@ public: class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint { - ScSplitPos eOldGridWin; + ScSplitPos const eOldGridWin; public: ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin ); virtual ~ScAccGridWinFocusLostHint() override; @@ -48,7 +48,7 @@ public: class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint { - ScSplitPos eNewGridWin; + ScSplitPos const 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 78b5316f7799..442ff773640e 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -114,7 +114,7 @@ protected: ScDocument* mpDoc; - sal_Int32 mnIndex; + sal_Int32 const mnIndex; private: virtual bool IsEditable( diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index c5b4f66179a1..d616fa708e54 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -284,7 +284,7 @@ private: /** This is the role of this object. */ - sal_Int16 maRole; + sal_Int16 const maRole; }; #endif diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 4dd0ed01ef05..d2c5de0997ce 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -472,9 +472,9 @@ protected: private: OUString maCellText; /// The text contents of this cell. - 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. + 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. public: explicit ScAccessibleCsvCell( diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index e2ada8048adf..c3441465121c 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -227,7 +227,7 @@ protected: private: ScTabViewShell* mpViewShell; - ScSplitPos meSplitPos; + ScSplitPos const 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 fe6aa89a87a7..7fb9c6c1b569 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -164,7 +164,7 @@ private: std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper; EditView* mpEditView; VclPtr<vcl::Window> mpWindow; - EditObjectType meObjectType; + EditObjectType const meObjectType; bool mbHasFocus; bool IsDefunc( diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index ac1b8ea2c403..b0ec25cc8143 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -77,8 +77,8 @@ protected: private: ScPreviewShell* mpViewShell; - sal_Int32 mnIndex; - bool mbHeader; + sal_Int32 const mnIndex; + bool const 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 e579dd7a1b33..1217e7b5af57 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -115,7 +115,7 @@ protected: private: ScPreviewShell* mpViewShell; accessibility::AccessibleTextHelper* mpTextHelper; - sal_Int32 mnIndex; + sal_Int32 const mnIndex; ScAddress maCellPos; bool mbColumnHeader; bool mbRowHeader; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 54d7b92f8190..212f0244f5b5 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 mnIndex; + sal_Int32 const 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 613d749f3376..ab7a070fd48f 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -221,7 +221,7 @@ private: ScSplitPos meSplitPos; ScAddress maActiveCell; SCTAB mnTab; - bool mbIsSpreadsheet; + bool const mbIsSpreadsheet; bool mbDelIns; bool mbIsFocusSend; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 1c3ba06ec137..2655fe67f0d7 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -226,7 +226,7 @@ public: protected: /// contains the range of the table, because it could be a subrange of the complete table - ScRange maRange; + ScRange const maRange; ScDocument* mpDoc; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index aa222531282a..ec9e1a8f4411 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 meSplitPos; + ScSplitPos const meSplitPos; ScAccessibleCell* mpAccessibleCell; using ScAccessibleCellBaseTextData::GetDocShell; @@ -189,9 +189,9 @@ public: private: std::unique_ptr<ScPreviewViewForwarder> mpViewForwarder; ScPreviewShell* mpViewShell; - OUString maText; - bool mbColHeader; - bool mbRowHeader; + OUString const maText; + bool const mbColHeader; + bool const mbRowHeader; using ScAccessibleCellBaseTextData::GetDocShell; static ScDocShell* GetDocShell(ScPreviewShell* pViewShell); @@ -221,7 +221,7 @@ private: ScDocShell* mpDocSh; const EditTextObject* mpEditObj; bool mbDataValid; - SvxAdjust meAdjust; + SvxAdjust const meAdjust; }; class ScAccessibleNoteTextData : public ScAccessibleTextData @@ -246,9 +246,9 @@ private: std::unique_ptr<ScEditEngineDefaulter> mpEditEngine; std::unique_ptr<SvxEditEngineForwarder> mpForwarder; ScDocShell* mpDocSh; - OUString msText; - ScAddress maCellPos; - bool mbMarkNote; + OUString const msText; + ScAddress const maCellPos; + bool const mbMarkNote; bool mbDataValid; }; @@ -262,8 +262,8 @@ private: EditEngine* mpEditEngine; TextForwarderPtr mpTextForwarder; ViewForwarderPtr mpViewForwarder; - OUString maCellText; - Size maCellSize; + OUString const maCellText; + Size const maCellSize; public: explicit ScAccessibleCsvTextData( diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 96d6218adb3d..c35693609105 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -27,7 +27,7 @@ class ScItemValue final { public: - OUString maName; + OUString const maName; ScPivotFuncData maFunctionData; ScItemValue* mpOriginalItemValue; @@ -46,9 +46,9 @@ public: private: ScViewData* mpViewData; - ScDocument* mpDocument; + ScDocument* const mpDocument; - bool mbNewPivotTable; + bool const mbNewPivotTable; VclPtr<ScPivotLayoutTreeListLabel> mpListBoxField; VclPtr<ScPivotLayoutTreeList> mpListBoxPage; @@ -82,7 +82,7 @@ private: VclPtr<CancelButton> mpBtnCancel; VclPtr<formula::RefEdit> mpActiveEdit; - ScAddress::Details maAddressDetails; + ScAddress::Details const maAddressDetails; bool mbDialogLostFocus; DECL_LINK(CancelClicked, Button*, void); diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index e1c4da9311f8..7719a679105e 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -53,8 +53,8 @@ private: VclPtr<CloseButton> mpButtonClose; // Data - ScViewData* mpViewData; - ScDocument* mpDoc; + ScViewData* const mpViewData; + ScDocument* const mpDoc; ScRange maInputRange; diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 39504e3c186b..8446227c9d41 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -53,14 +53,14 @@ private: VclPtr<formula::RefEdit> mpActiveEdit; // Data - ScViewData* mViewData; - ScDocument* mDocument; + ScViewData* const mViewData; + ScDocument* const mDocument; - ScRange mInputRange; - ScAddress::Details mAddressDetails; - ScAddress mOutputAddress; + ScRange mInputRange; + ScAddress::Details const mAddressDetails; + ScAddress mOutputAddress; - ScAddress mCurrentAddress; + ScAddress const mCurrentAddress; bool mDialogLostFocus; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index c74be8514c53..683d24112c77 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -56,13 +56,13 @@ protected: VclPtr<RadioButton> mpGroupByRowsRadio; // Data - ScViewData* mViewData; - ScDocument* mDocument; + ScViewData* const mViewData; + ScDocument* const mDocument; - ScRange mInputRange; - ScAddress::Details mAddressDetails; - ScAddress mOutputAddress; - GroupedBy mGroupedBy; + ScRange mInputRange; + ScAddress::Details const 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); @@ -72,8 +72,8 @@ private: VclPtr<OKButton> mpButtonOk; VclPtr<formula::RefEdit> mpActiveEdit; - ScAddress mCurrentAddress; - bool mDialogLostFocus; + ScAddress const mCurrentAddress; + bool mDialogLostFocus; void Init(); void GetRangeFromSelection(); diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index f154acc7cd9f..ea6fadbe7a97 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -59,15 +59,15 @@ protected: VclPtr<formula::RefButton> mpOutputRangeButton; // Data - ScViewData* mViewData; - ScDocument* mDocument; + ScViewData* const mViewData; + ScDocument* const mDocument; - ScRange mVariable1Range; - ScRange mVariable2Range; + ScRange mVariable1Range; + ScRange mVariable2Range; - ScAddress::Details mAddressDetails; - ScAddress mOutputAddress; - GroupedBy mGroupedBy; + ScAddress::Details const mAddressDetails; + ScAddress mOutputAddress; + GroupedBy mGroupedBy; private: // Widgets @@ -77,8 +77,8 @@ private: VclPtr<RadioButton> mpGroupByRowsRadio; VclPtr<formula::RefEdit> mpActiveEdit; - ScAddress mCurrentAddress; - bool mDialogLostFocus; + ScAddress const mCurrentAddress; + bool mDialogLostFocus; void Init(); void GetRangeFromSelection(); diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index c52cf2838fb0..a5d1176a8bae 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -25,7 +25,7 @@ class FormulaTemplate { private: OUString mTemplate; - ScDocument* mpDoc; + ScDocument* const mpDoc; bool mbUse3D; typedef std::map<OUString, ScRange> RangeReplacementMap; @@ -58,7 +58,7 @@ public: std::vector<ScAddress> mAddressStack; ScAddress mCurrentAddress; - ScAddress mMinimumAddress; + ScAddress const mMinimumAddress; ScAddress mMaximumAddress; AddressWalker(const ScAddress& aInitialAddress); @@ -79,7 +79,7 @@ class AddressWalkerWriter : public AddressWalker public: ScDocShell* mpDocShell; ScDocument* mpDocument; - formula::FormulaGrammar::Grammar meGrammar; + formula::FormulaGrammar::Grammar const meGrammar; AddressWalkerWriter(const ScAddress& aInitialAddress, ScDocShell* pDocShell, ScDocument* pDocument, formula::FormulaGrammar::Grammar eGrammar ); @@ -95,8 +95,8 @@ public: class DataCellIterator final { private: - ScRange mInputRange; - bool mByColumn; + ScRange const mInputRange; + bool const mByColumn; SCCOL mCol; SCROW mRow; @@ -113,7 +113,7 @@ public: class DataRangeIterator { protected: - ScRange mInputRange; + ScRange const mInputRange; sal_Int32 mIndex; public: diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 2cca8dcc3416..a1d52b400387 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -72,13 +72,13 @@ class ScAcceptChgDlg final : public SfxModelessDialog OUString aStrMove; OUString aStrContent; OUString aStrReject; - OUString aStrAllAccepted; - OUString aStrAllRejected; - OUString aStrNoEntry; - OUString aStrContentWithChild; - OUString aStrChildContent; - OUString aStrChildOrgContent; - OUString aStrEmpty; + OUString const aStrAllAccepted; + OUString const aStrAllRejected; + OUString const aStrNoEntry; + OUString const aStrContentWithChild; + OUString const aStrChildContent; + OUString const aStrChildOrgContent; + OUString const 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 084f15e1b62c..d868083031cc 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -47,7 +47,7 @@ class ScFormulaReferenceHelper VclPtr<formula::RefEdit> m_pRefEdit; // active input field VclPtr<formula::RefButton> m_pRefBtn; // associated button VclPtr<vcl::Window> m_pWindow; - SfxBindings* m_pBindings; + SfxBindings* const m_pBindings; ::std::unique_ptr<Accelerator> m_pAccel; // for Enter/Escape ::std::vector<VclPtr<vcl::Window> > m_aHiddenWidgets; // vector of hidden Controls @@ -113,7 +113,7 @@ public: private: ScFormulaReferenceHelper m_aHelper; - SfxBindings* m_pMyBindings; + SfxBindings* const m_pMyBindings; VclPtr<vcl::Window> m_pActiveWin; Idle m_aIdle; diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index a21a5b4f0073..cf4cbc587810 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -30,12 +30,12 @@ class ScAreaLink; class ScAreaLinkSaver { private: - OUString aFileName; - OUString aFilterName; - OUString aOptions; - OUString aSourceArea; - ScRange aDestArea; - sal_uLong nRefresh; + OUString const aFileName; + OUString const aFilterName; + OUString const aOptions; + OUString const aSourceArea; + ScRange const aDestArea; + sal_uLong const nRefresh; public: ScAreaLinkSaver( const ScAreaLink& rSource ); diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index d84f7a2a077e..8c951603c8ce 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -39,10 +39,10 @@ struct ScAutoStyleData }; struct ScAutoStyleInitData { - ScRange aRange; - OUString aStyle1; - sal_uLong nTimeout; - OUString aStyle2; + ScRange const aRange; + OUString const aStyle1; + sal_uLong const nTimeout; + OUString const 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 282cf9a585be..4d88d6194186 100644 --- a/sc/source/ui/inc/cellmergeoption.hxx +++ b/sc/source/ui/inc/cellmergeoption.hxx @@ -23,7 +23,7 @@ struct ScCellMergeOption SCROW mnStartRow; SCCOL mnEndCol; SCROW mnEndRow; - bool mbCenter; + bool const 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 8838418cfc18..00cc4e798f9e 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -46,8 +46,8 @@ private: OUString maStrWarnSameValue; SvNumberFormatter* mpNumberFormatter; - ScDocument* mpDoc; - ScAddress maPos; + ScDocument* const mpDoc; + ScAddress const maPos; DECL_LINK(OkBtnHdl, Button*, void); DECL_LINK(TypeSelectHdl, ListBox&, void); diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index b5f793fea0ac..fe5e0e24d75a 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 meWhich; + ScHSplitPos const meWhich; ScHeaderFunctionSet* mpFuncSet; public: @@ -59,7 +59,7 @@ public: class ScRowBar : public ScHeaderControl { - ScVSplitPos meWhich; + ScVSplitPos const meWhich; ScHeaderFunctionSet* mpFuncSet; public: diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 086c7c7ee6ed..53cf931c8a71 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -53,7 +53,7 @@ private: VclPtr<FixedText> maFtCondNr; VclPtr<FixedText> maFtCondition; - OUString maStrCondition; + OUString const maStrCondition; protected: VclPtr<ListBox> maLbType; diff --git a/sc/source/ui/inc/condformatdlgitem.hxx b/sc/source/ui/inc/condformatdlgitem.hxx index 149bf6d61351..89523b9c237b 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 mnItem; + sal_Int32 const mnItem; condformat::dialog::ScCondFormatDialogType meDialogType; - bool mbManaged; + bool const mbManaged; }; #endif diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 369bfb679f5f..fec437fd6fa1 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -32,7 +32,7 @@ private: OUString createEntryString(const ScConditionalFormat& rFormat); void setColSizes(); - ScDocument* mpDoc; + ScDocument* const mpDoc; ScConditionalFormatList* mpFormatList; std::map<SvTreeListEntry*, sal_Int32> maMapLBoxEntryToCondIndex; diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx index 4ee0adc680af..65ce1e4a70f7 100644 --- a/sc/source/ui/inc/condformatuno.hxx +++ b/sc/source/ui/inc/condformatuno.hxx @@ -70,7 +70,7 @@ public: ScConditionalFormatList* getCoreObject(); private: - SCTAB mnTab; + SCTAB const mnTab; ScDocShell* mpDocShell; }; @@ -120,8 +120,8 @@ public: private: rtl::Reference<ScCondFormatsObj> mxCondFormatList; ScDocShell* mpDocShell; - SfxItemPropertySet maPropSet; - sal_Int32 mnKey; + SfxItemPropertySet const maPropSet; + sal_Int32 const mnKey; }; class ScConditionEntryObj : public cppu::WeakImplHelper<css::beans::XPropertySet, @@ -157,7 +157,7 @@ public: private: ScDocShell* mpDocShell; rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet maPropSet; + SfxItemPropertySet const maPropSet; const ScCondFormatEntry* mpFormat; }; @@ -193,7 +193,7 @@ public: private: rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet maPropSet; + SfxItemPropertySet const maPropSet; const ScColorScaleFormat* mpFormat; }; @@ -220,7 +220,7 @@ private: ScColorScaleEntry* getCoreObject(); rtl::Reference<ScColorScaleFormatObj> mxParent; - size_t mnPos; + size_t const mnPos; }; class ScDataBarFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, @@ -254,7 +254,7 @@ public: private: rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet maPropSet; + SfxItemPropertySet const maPropSet; const ScDataBarFormat* mpFormat; }; @@ -277,7 +277,7 @@ private: ScColorScaleEntry* getCoreObject(); rtl::Reference<ScDataBarFormatObj> mxParent; - size_t mnPos; + size_t const mnPos; }; class ScIconSetFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, @@ -311,7 +311,7 @@ public: private: rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet maPropSet; + SfxItemPropertySet const maPropSet; const ScIconSetFormat* mpFormat; }; @@ -334,7 +334,7 @@ private: ScColorScaleEntry* getCoreObject(); rtl::Reference<ScIconSetFormatObj> mxParent; - size_t mnPos; + size_t const mnPos; }; class ScCondDateFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, @@ -369,7 +369,7 @@ public: private: rtl::Reference<ScCondFormatObj> mxParent; - SfxItemPropertySet maPropSet; + SfxItemPropertySet const maPropSet; const ScCondDateFormatEntry* mpFormat; }; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 96b5414b31df..67d7aab30183 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -75,11 +75,11 @@ public: class ScConflictsFinder final { private: - ScChangeTrack* mpTrack; - sal_uLong mnStartShared; - sal_uLong mnEndShared; - sal_uLong mnStartOwn; - sal_uLong mnEndOwn; + ScChangeTrack* const mpTrack; + sal_uLong const mnStartShared; + sal_uLong const mnEndShared; + sal_uLong const mnStartOwn; + sal_uLong const mnEndOwn; ScConflictsList& mrConflictsList; static bool DoActionsIntersect( const ScChangeAction* pAction1, const ScChangeAction* pAction2 ); @@ -122,13 +122,13 @@ private: VclPtr<PushButton> m_pBtnKeepAllMine; VclPtr<PushButton> m_pBtnKeepAllOthers; - OUString maStrTitleConflict; - OUString maStrUnknownUser; + OUString const maStrTitleConflict; + OUString const maStrUnknownUser; - ScViewData* mpViewData; + ScViewData* const mpViewData; ScDocument* mpOwnDoc; ScChangeTrack* mpOwnTrack; - ScDocument* mpSharedDoc; + ScDocument* const mpSharedDoc; ScChangeTrack* mpSharedTrack; ScConflictsList& mrConflictsList; diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 5c6429e8825c..d4cab7300678 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -72,15 +72,15 @@ private: VclPtr<PushButton> pBtnAdd; VclPtr<PushButton> pBtnRemove; - OUString aStrUndefined; + OUString const aStrUndefined; - ScConsolidateParam theConsData; + ScConsolidateParam const theConsData; ScViewData& rViewData; - ScDocument* pDoc; + ScDocument* const pDoc; std::unique_ptr<ScRangeUtil> pRangeUtil; std::unique_ptr<ScAreaData[]> pAreaData; size_t nAreaDataCount; - sal_uInt16 nWhichCons; + sal_uInt16 const nWhichCons; VclPtr<formula::RefEdit> pRefInputEdit; bool bDlgLostFocus; diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index ff1b346208c7..23b332b2ab58 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -67,7 +67,7 @@ private: typedef std::unordered_map< OUString, ScRange > NameRangeMap; NameRangeMap aRangeMap; - ScViewData* pViewData; + ScViewData* const pViewData; ScDocument* pDoc; VclPtr<formula::RefEdit> pEdActive; bool bDlgLostFocus; diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 9c348fa9c2b1..7ef77ef1b9dc 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 mbAppRTL; /// true = application in RTL mode. + bool const mbAppRTL; /// true = application in RTL mode. explicit ScCsvLayoutData(); diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 3dfe6abfc6fd..2fc364f650a2 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -76,7 +76,7 @@ private: Color maSelectColor; /// Header color of selected columns. ScEditEnginePtr mpEditEngine; /// For drawing cell texts. - vcl::Font maHeaderFont; /// Font for column and row headers. + vcl::Font const maHeaderFont; /// Font for column and row headers. vcl::Font maMonoFont; /// Monospace font for data cells. Size maWinSize; /// Size of the control. Size maEdEngSize; /// Paper size for edit engine. diff --git a/sc/source/ui/inc/dataprovider.hxx b/sc/source/ui/inc/dataprovider.hxx index 9f1d0a179e51..a3311e7fde80 100644 --- a/sc/source/ui/inc/dataprovider.hxx +++ b/sc/source/ui/inc/dataprovider.hxx @@ -47,7 +47,7 @@ class DataTransformation; class CSVFetchThread : public salhelper::Thread { ScDocument& mrDocument; - OUString maURL; + OUString const maURL; bool mbTerminate; osl::Mutex maMtxTerminate; @@ -56,7 +56,7 @@ class CSVFetchThread : public salhelper::Thread std::vector<std::shared_ptr<sc::DataTransformation>> maDataTransformations; - std::function<void()> maImportFinishedHdl; + std::function<void()> const maImportFinishedHdl; public: @@ -104,7 +104,7 @@ public: class CSVDataProvider : public DataProvider { rtl::Reference<CSVFetchThread> mxCSVFetchThread; - ScDocument* mpDocument; + ScDocument* const mpDocument; ScDocumentUniquePtr mpDoc; void Refresh(); diff --git a/sc/source/ui/inc/datatransformation.hxx b/sc/source/ui/inc/datatransformation.hxx index a8c54dabbd59..8077dce93e9d 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> maColumns; + std::set<SCCOL> const maColumns; public: @@ -75,8 +75,8 @@ public: class SC_DLLPUBLIC SplitColumnTransformation : public DataTransformation { - SCCOL mnCol; - sal_Unicode mcSeparator; + SCCOL const mnCol; + sal_Unicode const mcSeparator; public: @@ -89,7 +89,7 @@ public: class SC_DLLPUBLIC MergeColumnTransformation : public DataTransformation { - std::set<SCCOL> maColumns; + std::set<SCCOL> const maColumns; OUString maMergeString; public: @@ -103,7 +103,7 @@ public: class SC_DLLPUBLIC SortTransformation : public DataTransformation { - ScSortParam maSortParam; + ScSortParam const maSortParam; public: SortTransformation(const ScSortParam& rParam); @@ -114,8 +114,8 @@ public: class SC_DLLPUBLIC TextTransformation : public DataTransformation { - std::set<SCCOL> mnCol; - TEXT_TRANSFORM_TYPE maType; + std::set<SCCOL> const mnCol; + TEXT_TRANSFORM_TYPE const 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> maColumns; - AGGREGATE_FUNCTION maType; + std::set<SCCOL> const maColumns; + AGGREGATE_FUNCTION const 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> mnCol; - NUMBER_TRANSFORM_TYPE maType; - int maPrecision; + std::set<SCCOL> const mnCol; + NUMBER_TRANSFORM_TYPE const maType; + int const 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> mnCol; - OUString msReplaceWith; + std::set<SCCOL> const mnCol; + OUString const 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> mnCol; - DATETIME_TRANSFORMATION_TYPE maType; + std::set<SCCOL> const mnCol; + DATETIME_TRANSFORMATION_TYPE const 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 4c04a25d3c6f..70b41eab3836 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -77,9 +77,9 @@ private: OUString aStrOperations; ScViewData* pViewData; - ScDocument* pDoc; + ScDocument* const pDoc; bool bRefInputMode; - ScAddress::Details aAddrDetails; + ScAddress::Details const aAddrDetails; ScDBCollection aLocalDbCol; ScRange theCurArea; diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 42ab6e6c7341..0a8ad0ffe795 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -85,7 +85,7 @@ private: private: VclPtr<DateField> mpEdValue; - Date maNullDate; + Date const maNullDate; }; class ScDPNumGroupDlg : public ModalDialog diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 0a4dcb952e28..b2604df48d3c 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -61,7 +61,7 @@ private: ScRangeListVector m_aProtectedChartRangesVector; - OUString maShellID; + OUString const maShellID; void InitDocShell(); SdrOle2Obj* GetSingleObject(); diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index bc1ef9b3ecbb..01ff63e6e712 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -54,8 +54,8 @@ public: bool VerifyPosStr ( const OUString& rPosStr ) const; private: - ScViewData* pViewData; - ScDocument* pDoc; + ScViewData* const pViewData; + ScDocument* const pDoc; VclPtr<CheckBox> pBtnCase; VclPtr<CheckBox> pBtnRegExp; diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index c00f64ef7341..74bdc96d2308 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -47,7 +47,7 @@ protected: VclPtr<vcl::Window> pWindow; SdrModel* pDrDoc; - SfxRequest aSfxRequest; + SfxRequest const aSfxRequest; VclPtr<Dialog> pDialog; Timer aScrollTimer; // for Autoscrolling diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx index a6c484afa7f3..70cd96dfe8aa 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 nOneX; - long nOneY; + long const nOneX; + long const nOneY; long nFixStart; long nFixEnd; long nVarStart; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index b44976272721..487559143a0c 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -134,7 +134,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou std::unique_ptr<sc::SpellCheckContext> mpSpellCheckCxt; ScViewData* pViewData; - ScSplitPos eWhich; + ScSplitPos const eWhich; ScHSplitPos eHWhich; ScVSplitPos eVWhich; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index 39da558aec72..03bbb265d244 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -39,13 +39,13 @@ private: vcl::Font aBoldFont; bool bBoldSet; - bool bVertical; // Vertical = Row header + bool const bVertical; // Vertical = Row header long nWidth; long nSmallWidth; long nBigWidth; - SCCOLROW nSize; + SCCOLROW const nSize; SCCOLROW nMarkStart; SCCOLROW nMarkEnd; diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index ae4738f085c4..425f2466c44c 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.hxx @@ -26,8 +26,8 @@ struct ScHighlightEntry { - ScRange aRef; - Color aColor; + ScRange const aRef; + Color const 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 e297c1b7498a..f33d777bb97e 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -56,14 +56,14 @@ class ScImportExport OUString aNonConvertibleChars; OUString maFilterOptions; sal_uLong nSizeLimit; - SCROW nMaxImportRow; + SCROW const 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 bUndo; // with Undo? + bool const 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 476e19a6291d..76a56ac6b162 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -46,7 +46,7 @@ class ScMessagePool: public SfxItemPool ScCondFormatDlgItem aCondFormatDlgItem; std::vector<SfxPoolItem*> mvPoolDefaults; - ScDocumentPool* pDocPool; + ScDocumentPool* const pDocPool; public: ScMessagePool(); diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index e879d1380e89..7d5885045d2a 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -42,11 +42,11 @@ private: VclPtr<PushButton> m_pBtnCancel; VclPtr<FixedText> m_pFtInfo; - bool mbUndo; //if true we need to add an undo action after creating a range name + bool const mbUndo; //if true we need to add an undo action after creating a range name ScDocument* mpDoc; ScDocShell* mpDocShell; - ScAddress maCursorPos; + ScAddress const 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 1e9b2cd09c55..c429dc8b6d3d 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -44,7 +44,7 @@ public: }; private: - OUString maGlobalString; + OUString const 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 c2f28289d6fd..4f6a639586ec 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -189,12 +189,12 @@ private: Size aExpandedSize; Idle aContentIdle; - OUString aStrDragMode; - OUString aStrDisplay; + OUString const aStrDragMode; + OUString const aStrDisplay; OUString aStrActive; OUString aStrNotActive; OUString aStrHidden; - OUString aStrActiveWin; + OUString const aStrActiveWin; sal_uInt16 nZoomId; sal_uInt16 nChangeRootId; diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index a8a7fd8d01dc..c53ead3fce2c 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -37,13 +37,13 @@ private: VclPtr<vcl::Window> m_pBottomWin; VclPtr<vcl::Window> m_pDiagWin; ScDocument* m_pDoc; - ScAddress m_aDocPos; - OUString m_aUserText; + ScAddress const m_aDocPos; + OUString const m_aUserText; tools::Rectangle m_aVisRect; Timer m_aTimer; - MapMode m_aMapMode; - bool m_bLeft; - bool m_bByKeyboard; + MapMode const m_aMapMode; + bool const m_bLeft; + bool const m_bByKeyboard; tools::Rectangle m_aRect; ScDrawView* m_pDrawView; diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index 2fce780ba218..daf40d437532 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -33,8 +33,8 @@ class ScOutlineWindow : public vcl::Window { private: ScViewData& mrViewData; /// View data containing the document. - ScSplitPos meWhich; /// Which area in split window. - bool mbHoriz; /// true = Horizontal orientation. + ScSplitPos const meWhich; /// Which area in split window. + bool const 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 989fe26819a9..99122297b28d 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -60,15 +60,15 @@ struct ScOptConditionRow /// All settings from the dialog, saved with the DocShell for the next call class ScOptSolverSave { - 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; + 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; public: ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue, @@ -154,8 +154,8 @@ private: VclPtr<PushButton> m_pBtnCancel; VclPtr<PushButton> m_pBtnSolve; - OUString maInputError; - OUString maConditionError; + OUString const maInputError; + OUString const maConditionError; ScDocShell* mpDocShell; ScDocument& mrDoc; diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index e915a71e0aed..b833eec20333 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -80,12 +80,12 @@ private: class DrawEditParam { public: - SvxCellHorJustify meHorJustAttr; ///< alignment attribute + SvxCellHorJustify const meHorJustAttr; ///< alignment attribute SvxCellHorJustify meHorJustContext; ///< context depending on attribute, content and direction SvxCellHorJustify meHorJustResult; ///< result for EditEngine SvxCellVerJustify meVerJust; - SvxCellJustifyMethod meHorJustMethod; - SvxCellJustifyMethod meVerJustMethod; + SvxCellJustifyMethod const meHorJustMethod; + SvxCellJustifyMethod const meVerJustMethod; SvxCellOrientation meOrient; SCSIZE mnArrY; SCCOL mnX; @@ -94,8 +94,8 @@ private: long mnPosX; long mnPosY; long mnInitPosX; - bool mbBreak:1; - bool mbCellIsValue:1; + bool const mbBreak:1; + bool const mbCellIsValue:1; bool mbAsianVertical:1; bool mbPixelToLogic:1; bool mbHyphenatorSet:1; @@ -147,25 +147,25 @@ private: VclPtr<OutputDevice> pFmtDevice; // reference for text formatting ScTableInfo& mrTabInfo; RowInfo* pRowInfo; // Info block - SCSIZE nArrCount; // occupied lines in info block + SCSIZE const nArrCount; // occupied lines in info block ScDocument* mpDoc; // Document SCTAB nTab; // sheet - long nScrX; // Output Startpos. (Pixel) - long nScrY; + long const nScrX; // Output Startpos. (Pixel) + long const nScrY; long nScrW; // Output size (Pixel) long nScrH; long nMirrorW; // Visible output width for mirroring (default: nScrW) - SCCOL nX1; // Start-/End coordinates - SCROW nY1; // ( incl. hidden ) - SCCOL nX2; - SCROW nY2; + SCCOL const nX1; // Start-/End coordinates + SCROW const nY1; // ( incl. hidden ) + SCCOL const nX2; + SCROW const nY2; SCCOL nVisX1; // Start-/End coordinates SCROW nVisY1; // ( visible range ) SCCOL nVisX2; SCROW nVisY2; - ScOutputType eType; // Screen/Printer ... - double mnPPTX; // Pixel per Twips - double mnPPTY; + ScOutputType const eType; // Screen/Printer ... + double const mnPPTX; // Pixel per Twips + double const mnPPTY; Fraction aZoomX; Fraction aZoomY; @@ -183,7 +183,7 @@ private: bool bSolidBackground; // white instead of transparent bool mbUseStyleColor; - bool mbForceAutoColor; + bool const 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 31d7b04d73a6..7b4537d02004 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -75,7 +75,7 @@ private: std::unique_ptr<ScQueryItem> pOutItem; ScViewData* pViewData; ScDocument* pDoc; - SCTAB nSrcTab; + SCTAB const nSrcTab; VclPtr<ComboBox> aValueEdArr[3]; VclPtr<ListBox> aFieldLbArr[3]; diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx index 7022f4dbe387..b6657ef854eb 100644 --- a/sc/source/ui/inc/prevloc.hxx +++ b/sc/source/ui/inc/prevloc.hxx @@ -92,7 +92,7 @@ public: typedef std::list<std::unique_ptr<ScPreviewLocationEntry>> Entries_t; private: VclPtr<OutputDevice> pWindow; - ScDocument* pDoc; + ScDocument* const 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 8bcab45ffcba..650ae66176b2 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -78,10 +78,10 @@ private: std::vector<VclPtr<VclHBox>> maSheets; - OUString maTextNotProtected; - OUString maTextNotPassProtected; - OUString maTextHashBad; - OUString maTextHashGood; + OUString const maTextNotProtected; + OUString const maTextNotPassProtected; + OUString const maTextHashBad; + OUString const maTextHashGood; DECL_LINK( OKHdl, Button*, void ); DECL_LINK( RetypeBtnHdl, Button*, void ); @@ -112,7 +112,7 @@ private: void CheckPasswordInput(); private: - ScPassHashProtectable* m_pProtected; + ScPassHashProtectable* const 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 2dda7f545ff3..46c030409415 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -28,7 +28,7 @@ struct ScRangeFindData { ScRange aRef; - ScRefFlags nFlags; + ScRefFlags const nFlags; sal_Int32 nSelStart; sal_Int32 nSelEnd; Color nColor; @@ -40,7 +40,7 @@ struct ScRangeFindData class ScRangeFindList { std::vector<ScRangeFindData> maEntries; - OUString aDocName; + OUString const aDocName; bool bHidden; sal_uInt16 nIndexColor; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 3d5ecf4ce7e5..67b997059a61 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -53,7 +53,7 @@ private: VclPtr<CheckBox> m_pCbProtect; VclPtr<OKButton> m_pBtnOk; const OUString aDefScenarioName; - bool bIsEdit; + bool const bIsEdit; DECL_LINK( OkHdl, Button*, void); DECL_LINK( EnableHdl, Button*, void ); diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 25956d0780e4..850d992b4471 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -82,13 +82,12 @@ class ScImportAsciiDlg : public ModalDialog VclPtr<ScCsvTableBox> mpTableBox; - OUString aTextSepList; OUString maFieldSeparators; // selected field separators sal_Unicode mcTextSep; rtl_TextEncoding meCharSet; /// Selected char set. bool mbCharSetSystem; /// Is System char set selected? - ScImportAsciiCall meCall; /// How the dialog is called (see asciiopt.hxx) + ScImportAsciiCall const meCall; /// How the dialog is called (see asciiopt.hxx) bool mbDetectSpaceSep; /// Whether to detect a possible space separator. public: diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 67adc8a6c7e1..a00beb1e68de 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -47,11 +47,11 @@ private: VclPtr<CheckBox> m_pBtnPattern; VclPtr<CheckBox> m_pBtnAlignment; VclPtr<CheckBox> m_pBtnAdjust; - OUString aStrTitle; - OUString aStrLabel; - OUString aStrClose; - OUString aStrDelMsg; - OUString aStrRename; + OUString const aStrTitle; + OUString const aStrLabel; + OUString const aStrClose; + OUString const aStrDelMsg; + OUString const aStrRename; ScAutoFormat* pFormat; const ScAutoFormatData* pSelFmtData; diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index fdc70bc026ab..e4202eeb0575 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -62,7 +62,7 @@ private: std::unique_ptr<ScDelimiterTable> pFieldSepTab; std::unique_ptr<ScDelimiterTable> pTextSepTab; - bool m_bIsAsciiImport; + bool const m_bIsAsciiImport; private: sal_uInt16 GetCodeFromCombo( const ComboBox& rEd ) const; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 6c34d6ba7ddd..50cf77089460 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -84,7 +84,7 @@ private: ScEditWindow * m_pEditFocus; ///one of m_pWndLeft, m_pWndCenter, m_pWndRight - sal_uInt16 nWhich; + sal_uInt16 const nWhich; DECL_LINK( ObjectSelectHdl, ScEditWindow&, void ); diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index c50a12225727..843cb980f05e 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -24,8 +24,8 @@ class SearchResultsDlg : public ModelessDialog { VclPtr<SvSimpleTable> mpList; VclPtr<FixedText> mpSearchResults; - OUString aSkipped; - SfxBindings* mpBindings; + OUString const aSkipped; + SfxBindings* const mpBindings; ScDocument* mpDoc; DECL_LINK( ListSelectHdl, SvTreeListBox*, void ); diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 396b3be9376c..faddd6a92925 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -40,7 +40,7 @@ class ScSortKeyWindow public: ScSortKeyItems m_aSortKeyItems; private: - weld::Container* m_pBox; + weld::Container* const m_pBox; public: ScSortKeyWindow(weld::Container* pBox); diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index ca3912f0c2fc..cec0676459a2 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -75,7 +75,7 @@ protected: // for usage in derived classes ScDocument& mrDoc; private: - ScSelectionState maSelState; /// Selection data of the document. + ScSelectionState const 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. @@ -144,7 +144,7 @@ protected: virtual bool NeedsConversion() override; private: - ScConversionParam maConvParam; /// Conversion parameters. + ScConversionParam const maConvParam; /// Conversion parameters. }; #endif diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index af1537a33b9d..6495a796ac5f 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 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. + 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. }; #endif diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 2833d8e3d38a..65b8dece561f 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -72,7 +72,7 @@ private: ScRefAddress theRowCell; ScRefAddress theColCell; - ScDocument* pDoc; + ScDocument* const pDoc; const SCTAB nCurTab; VclPtr<formula::RefEdit> pEdActive; bool bDlgLostFocus; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 8ce857b54d20..344eda24850e 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -75,8 +75,8 @@ enum HeaderType class ScCornerButton : public vcl::Window { private: - ScViewData* pViewData; - bool bAdd; + ScViewData* const pViewData; + bool const bAdd; protected: virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; @@ -123,7 +123,7 @@ private: void Modifier(ScGridWindow* pWin); private: - ScTabViewShell* mpThisViewShell; + ScTabViewShell* const 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 6c42308a6ac9..755591835b9e 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* pViewShell; + ScTabViewShell* const pViewShell; public: diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 9782ad17ad77..e81f913d7dac 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -41,7 +41,7 @@ class ScZoomSliderWnd: public vcl::Window private: struct ScZoomSliderWnd_Impl; std::unique_ptr<ScZoomSliderWnd_Impl> mpImpl; - Size aLogicalSize; + Size const aLogicalSize; css::uno::Reference<css::frame::XDispatchProvider> m_xDispatchProvider; sal_uInt16 Offset2Zoom(long nOffset) const; diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index b8fbc732b3bb..f2a3e33284ac 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -71,7 +71,7 @@ private: std::unique_ptr<ScDocOptions> pOldOptions; std::unique_ptr<ScDocOptions> pLocalOptions; - sal_uInt16 nWhichCalc; + sal_uInt16 const nWhichCalc; private: void Init(); diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 95a7629f7d09..1e4c2b15788e 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -63,9 +63,9 @@ protected: private: Idle m_aIdle; - OUString aStrUndefined; - OUString aStrColumn; - OUString aStrRow; + OUString const aStrUndefined; + OUString const aStrColumn; + OUString const aStrRow; const sal_uInt16 nWhichSort; ScViewData* pViewData; @@ -116,9 +116,9 @@ protected: virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: - OUString aStrRowLabel; - OUString aStrColLabel; - OUString aStrUndefined; + OUString const aStrRowLabel; + OUString const aStrColLabel; + OUString const aStrUndefined; const sal_uInt16 nWhichSort; ScSortParam aSortData; diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 735c4a489f81..c3d0094fc949 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -44,10 +44,10 @@ struct ScQueryParam; class ScInputStatusItem : public SfxPoolItem { - ScAddress aCursorPos; - ScAddress aStartPos; - ScAddress aEndPos; - OUString aString; + ScAddress const aCursorPos; + ScAddress const aStartPos; + ScAddress const aEndPos; + OUString const aString; std::unique_ptr<EditTextObject> pEditData; const std::vector<editeng::MisspellRanges>* mpMisspellRanges; @@ -84,9 +84,9 @@ public: class ScTablesHint : public SfxHint { - sal_uInt16 nId; - SCTAB nTab1; - SCTAB nTab2; + sal_uInt16 const nId; + SCTAB const nTab1; + SCTAB const nTab2; public: ScTablesHint(sal_uInt16 nNewId, SCTAB nTable1, SCTAB nTable2=0); @@ -99,8 +99,8 @@ public: class ScEditViewHint : public SfxHint { - ScEditEngineDefaulter* pEditEngine; - ScAddress aCursorPos; + ScEditEngineDefaulter* const pEditEngine; + ScAddress const aCursorPos; public: ScEditViewHint() = delete; @@ -115,7 +115,7 @@ public: class ScIndexHint : public SfxHint { - sal_uInt16 nIndex; + sal_uInt16 const nIndex; public: ScIndexHint(SfxHintId nNewId, sal_uInt16 nIdx); @@ -143,7 +143,7 @@ public: const ScSortParam& GetSortData () const { return theSortData; } private: - ScViewData* pViewData; + ScViewData* const pViewData; ScSortParam theSortData; }; @@ -169,7 +169,7 @@ public: private: std::unique_ptr<ScQueryParam> mpQueryData; - ScViewData* pViewData; + ScViewData* const pViewData; ScRange aAdvSource; bool bIsAdvanced; }; @@ -191,7 +191,7 @@ public: const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } private: - ScViewData* pViewData; + ScViewData* const pViewData; ScSubTotalParam theSubTotalData; }; diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 1c2c707f1010..0057d549bfa4 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -89,7 +89,7 @@ public: protected: ScRange aBlockRange; std::unique_ptr<SdrUndoAction> pDrawUndo; - ScBlockUndoMode eMode; + ScBlockUndoMode const eMode; void BeginUndo(); void EndUndo(); @@ -124,7 +124,7 @@ class ScDBFuncUndo: public ScSimpleUndo { protected: std::unique_ptr<ScDBData> pAutoDBRange; - ScRange aOriginalRange; + ScRange const aOriginalRange; public: ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal ); @@ -150,7 +150,7 @@ protected: std::unique_ptr<SdrUndoAction> pDrawUndo; ScDocumentUniquePtr pRefUndoDoc; std::unique_ptr<ScRefUndoData> pRefUndoData; - ScMoveUndoMode eMode; + ScMoveUndoMode const eMode; void BeginUndo(); void EndUndo(); diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 0eb80137c926..93a8db996bf8 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -60,14 +60,14 @@ public: private: ScRange aEffRange; - SCTAB nCount; + SCTAB const nCount; std::unique_ptr<SCTAB[]> pTabs; std::unique_ptr<SCTAB[]> pScenarios; sal_uLong nEndChangeAction; - InsCellCmd eCmd; - bool bPartOfPaste; + InsCellCmd const eCmd; + bool const bPartOfPaste; std::unique_ptr<SfxUndoAction> pPasteUndo; @@ -93,14 +93,14 @@ public: private: ScRange aEffRange; - SCTAB nCount; + SCTAB const nCount; std::unique_ptr<SCTAB[]> pTabs; std::unique_ptr<SCTAB[]> pScenarios; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; - DelCellCmd eCmd; + DelCellCmd const eCmd; void DoChange ( const bool bUndo ); void SetChangeTrack(); @@ -125,9 +125,9 @@ public: virtual OUString GetComment() const override; private: - bool mbRows:1; - bool mbRefresh:1; - SCTAB nTab; + bool const mbRows:1; + bool const mbRefresh:1; + SCTAB const nTab; std::vector<sc::ColRowSpan> maSpans; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -154,10 +154,10 @@ public: virtual OUString GetComment() const override; private: - ScMarkData aMarkData; + ScMarkData const aMarkData; ScDocumentUniquePtr pUndoDoc; - ScRange aExtendedRange; + ScRange const aExtendedRange; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -205,7 +205,7 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; ScDocumentUniquePtr pRedoDoc; - InsertDeleteFlags nFlags; + InsertDeleteFlags const nFlags; std::unique_ptr<ScRefUndoData> pRefUndoData; std::unique_ptr<ScRefUndoData> pRefRedoData; sal_uLong nStartChangeAction; @@ -237,12 +237,12 @@ private: sal_uInt16 mnPaintExtFlags; ScRangeList maPaintRanges; - ScRange aSrcRange; + ScRange const aSrcRange; ScRange aDestRange; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; - bool bCut; - bool bKeepScenarioFlags; + bool const bCut; + bool const bKeepScenarioFlags; void PaintArea( ScRange aRange, sal_uInt16 nExtFlags ) const; void DoUndo( ScRange aRange ); @@ -272,14 +272,14 @@ public: private: std::shared_ptr<DataSpansType> mpDataSpans; // Spans of non-empty cells. - ScRange aRange; + ScRange const aRange; ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; // Block mark and deleted data std::unique_ptr<SdrUndoAction> pDrawUndo; // Deleted objects sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; - InsertDeleteFlags nFlags; - bool bMulti; // Multi selection + InsertDeleteFlags const nFlags; + bool const bMulti; // Multi selection void DoChange( const bool bUndo ); void SetChangeTrack(); @@ -304,18 +304,18 @@ public: virtual OUString GetComment() const override; private: - ScRange aRange; + ScRange const aRange; ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; // Block mark and deleted data sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; - InsertDeleteFlags nFlags; - ScPasteFunc nFunction; - SCTAB nSrcTab; - bool bMulti; // Multi selection - bool bSkipEmpty; - bool bAsLink; + InsertDeleteFlags const nFlags; + ScPasteFunc const nFunction; + SCTAB const nSrcTab; + bool const bMulti; // Multi selection + bool const bSkipEmpty; + bool const bAsLink; void DoChange( const bool bUndo ); void SetChangeTrack(); @@ -345,11 +345,11 @@ public: ScEditDataArray* GetDataArray(); private: ScMarkData aMarkData; - ScRange aRange; + ScRange const aRange; ScRange aRangeCover; std::unique_ptr<ScEditDataArray> mpDataArray; ScDocumentUniquePtr pUndoDoc; - bool bMulti; + bool const bMulti; ScPatternAttr* pApplyPattern; SvxBoxItem* pLineOuter; SvxBoxInfoItem* pLineInner; @@ -380,17 +380,17 @@ public: virtual OUString GetComment() const override; private: - ScMarkData aMarkData; - SCCOLROW nStart; - SCCOLROW nEnd; - SCTAB nStartTab; - SCTAB nEndTab; + ScMarkData aMarkData; + SCCOLROW const nStart; + SCCOLROW const nEnd; + SCTAB const nStartTab; + SCTAB const nEndTab; ScDocumentUniquePtr pUndoDoc; std::unique_ptr<ScOutlineTable> pUndoTab; - std::vector<sc::ColRowSpan> maRanges; - sal_uInt16 nNewSize; - bool bWidth; - ScSizeMode eMode; + std::vector<sc::ColRowSpan> const maRanges; + sal_uInt16 const nNewSize; + bool const bWidth; + ScSizeMode const eMode; std::unique_ptr<SdrUndoAction> pDrawUndo; }; @@ -413,16 +413,16 @@ public: virtual OUString GetComment() const override; private: - ScRange aSource; - ScMarkData aMarkData; + ScRange const aSource; + ScMarkData aMarkData; ScDocumentUniquePtr - pUndoDoc; - FillDir eFillDir; - FillCmd eFillCmd; - FillDateCmd eFillDateCmd; - double fStartValue; - double fStepValue; - double fMaxValue; + pUndoDoc; + FillDir const eFillDir; + FillCmd const eFillCmd; + FillDateCmd const eFillDateCmd; + double const fStartValue; + double const fStepValue; + double const fMaxValue; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -445,8 +445,8 @@ public: virtual OUString GetComment() const override; private: - ScCellMergeOption maOption; - bool mbMergeContents; // Merge contents in Redo(). + ScCellMergeOption const maOption; + bool const mbMergeContents; // Merge contents in Redo(). ScDocumentUniquePtr mxUndoDoc; // when data is merged std::unique_ptr<SdrUndoAction> mpDrawUndo; @@ -471,10 +471,10 @@ public: private: ScDocumentUniquePtr - pUndoDoc; // deleted data - ScMarkData aMarkData; - bool bSize; - sal_uInt16 nFormatNo; + pUndoDoc; // deleted data + ScMarkData aMarkData; + bool const bSize; + sal_uInt16 const nFormatNo; }; class ScUndoReplace: public ScSimpleUndo @@ -495,9 +495,9 @@ public: virtual OUString GetComment() const override; private: - ScAddress aCursorPos; - ScMarkData aMarkData; - OUString aUndoStr; // Data at single selection + ScAddress const aCursorPos; + ScMarkData const aMarkData; + OUString const aUndoStr; // Data at single selection ScDocumentUniquePtr pUndoDoc; // Block mark and deleted data std::unique_ptr<SvxSearchItem> pSearchItem; sal_uLong nStartChangeAction; @@ -528,14 +528,14 @@ public: virtual OUString GetComment() const override; private: - ScRange aRange; + ScRange const aRange; ScDocumentUniquePtr pUndoDoc; // Deleted data - ScRefAddress theFormulaCell; - ScRefAddress theFormulaEnd; - ScRefAddress theRowCell; - ScRefAddress theColCell; - ScTabOpParam::Mode meMode; + ScRefAddress const theFormulaCell; + ScRefAddress const theFormulaEnd; + ScRefAddress const theRowCell; + ScRefAddress const theColCell; + ScTabOpParam::Mode const meMode; }; class ScUndoConversion : public ScSimpleUndo @@ -556,14 +556,14 @@ public: virtual OUString GetComment() const override; private: - 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. + 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. void DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPos ); void SetChangeTrack(); @@ -588,8 +588,8 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; ScDocumentUniquePtr pRedoDoc; - ScRange aRange; - bool bMulti; + ScRange const aRange; + bool const bMulti; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -612,8 +612,8 @@ public: virtual OUString GetComment() const override; private: - ScDocumentUniquePtr xUndoDoc; - ScDocumentUniquePtr xRedoDoc; + ScDocumentUniquePtr const xUndoDoc; + ScDocumentUniquePtr const xRedoDoc; void DoChange( ScDocument* pSrcDoc ) const; }; @@ -634,9 +634,9 @@ public: private: void DoChange(ScDocument* pDoc); - ScDocumentUniquePtr mpUndoDoc; - ScDocumentUniquePtr mpRedoDoc; - ScRange maRange; + ScDocumentUniquePtr const mpUndoDoc; + ScDocumentUniquePtr const mpRedoDoc; + ScRange const maRange; }; class ScUndoConditionalFormatList : public ScSimpleUndo @@ -655,9 +655,9 @@ public: private: void DoChange(const ScDocument* pDoc); - ScDocumentUniquePtr mpUndoDoc; - ScDocumentUniquePtr mpRedoDoc; - SCTAB mnTab; + ScDocumentUniquePtr const mpUndoDoc; + ScDocumentUniquePtr const mpRedoDoc; + SCTAB const mnTab; }; class ScUndoUseScenario: public ScSimpleUndo @@ -681,7 +681,7 @@ private: pUndoDoc; ScRange aRange; ScMarkData aMarkData; - OUString aName; + OUString const aName; }; class ScUndoSelectionStyle: public ScSimpleUndo @@ -705,8 +705,8 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; - OUString aStyleName; - ScRange aRange; + OUString const aStyleName; + ScRange const aRange; void DoChange( const bool bUndo ); }; @@ -748,7 +748,7 @@ public: private: ScDocumentUniquePtr pUndoDoc; - OUString aFormula; + OUString const aFormula; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; @@ -773,12 +773,12 @@ public: virtual OUString GetComment() const override; private: - OUString aDocName; + OUString const aDocName; OUString aFltName; - OUString aOptions; + OUString const aOptions; OUString aAreaName; - ScRange aRange; - sal_uLong nRefreshDelay; + ScRange const aRange; + sal_uLong const nRefreshDelay; }; class ScUndoRemoveAreaLink : public ScSimpleUndo @@ -799,12 +799,12 @@ public: virtual OUString GetComment() const override; private: - OUString aDocName; + OUString const aDocName; OUString aFltName; - OUString aOptions; + OUString const aOptions; OUString aAreaName; - ScRange aRange; - sal_uLong nRefreshDelay; + ScRange const aRange; + sal_uLong const nRefreshDelay; }; class ScUndoUpdateAreaLink : public ScSimpleUndo //! also change BlockUndo? @@ -830,21 +830,21 @@ public: virtual OUString GetComment() const override; private: - OUString aOldDoc; - OUString aOldFlt; - OUString aOldOpt; - OUString aOldArea; - ScRange aOldRange; - OUString aNewDoc; - OUString aNewFlt; - OUString aNewOpt; - OUString aNewArea; - ScRange aNewRange; + 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; ScDocumentUniquePtr xUndoDoc; ScDocumentUniquePtr xRedoDoc; - sal_uLong nOldRefresh; - sal_uLong nNewRefresh; - bool bWithInsert; + sal_uLong const nOldRefresh; + sal_uLong const nNewRefresh; + bool const bWithInsert; void DoChange( const bool bUndo ) const; }; @@ -867,7 +867,7 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; - bool bIsIncrement; + bool const bIsIncrement; }; class ScUndoTransliterate: public ScBlockUndo @@ -888,7 +888,7 @@ private: ScMarkData aMarkData; ScDocumentUniquePtr pUndoDoc; - TransliterationFlags + TransliterationFlags const nTransliterationType; }; @@ -929,9 +929,8 @@ public: virtual OUString GetComment() const override; private: - SCTAB nTab; - ScDocumentUniquePtr - pUndoDoc; + SCTAB const nTab; + ScDocumentUniquePtr pUndoDoc; }; class ScUndoRemoveMerge: public ScBlockUndo diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 76ed55a83647..5785ac841c63 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -47,7 +47,7 @@ class ScUndoSdrCaptionObj: public SdrUndoAction { protected: SdrObjList* m_pObjList; - sal_uInt32 m_nOrdNum; + sal_uInt32 const m_nOrdNum; std::shared_ptr< SdrCaptionObj > m_pCaptionObj; void UnmarkObject(); @@ -110,9 +110,9 @@ public: void SetEditData( std::unique_ptr<EditTextObject> pOld, std::unique_ptr<EditTextObject> pNew ); private: - SCCOL nCol; - SCROW nRow; - SCTAB nTab; + SCCOL const nCol; + SCROW const nRow; + SCTAB const nTab; ScPatternAttr* pOldPattern; ScPatternAttr* pNewPattern; ScPatternAttr* pApplyPattern; @@ -152,10 +152,10 @@ public: private: ValuesType maOldValues; - OUString maNewString; + OUString const maNewString; std::unique_ptr<EditTextObject> mpNewEditData; sal_uLong mnEndChangeAction; - ScAddress maPos; + ScAddress const maPos; void DoChange() const; void SetChangeTrack(); @@ -178,10 +178,10 @@ public: virtual OUString GetComment() const override; private: - ScAddress aPos; - ScCellValue maOldCell; - double nValue; - sal_uLong nEndChangeAction; + ScAddress const aPos; + ScCellValue const maOldCell; + double const nValue; + sal_uLong nEndChangeAction; void SetChangeTrack(); }; @@ -205,9 +205,9 @@ private: void MoveCursorToCell(); private: - ScAddress maPos; - ScCellValue maOldValue; - ScCellValue maNewValue; + ScAddress const maPos; + ScCellValue const maOldValue; + ScCellValue const maNewValue; sal_uLong mnEndChangeAction; }; @@ -227,11 +227,11 @@ public: virtual OUString GetComment() const override; private: - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - bool bColumn; // Column or row break - bool bInsert; // Insert or Delete + SCCOL const nCol; + SCROW const nRow; + SCTAB const nTab; + bool const bColumn; // Column or row break + bool const bInsert; // Insert or Delete void DoChange( bool bInsert ) const; }; @@ -251,11 +251,11 @@ public: virtual OUString GetComment() const override; private: - SCTAB nTab; - sal_uInt16 nOldScale; - sal_uInt16 nOldPages; - sal_uInt16 nNewScale; - sal_uInt16 nNewPages; + SCTAB const nTab; + sal_uInt16 const nOldScale; + sal_uInt16 const nOldPages; + sal_uInt16 const nNewScale; + sal_uInt16 const nNewPages; void DoChange( bool bUndo ); }; @@ -276,13 +276,13 @@ public: virtual OUString GetComment() const override; private: - SCCOL nCol; - SCROW nRow; - SCTAB nTab; + SCCOL const nCol; + SCROW const nRow; + SCTAB const nTab; sal_uLong nEndChangeAction; - ScCellValue maOldText; - ScCellValue maNewText; + ScCellValue const maOldText; + ScCellValue const maNewText; void DoChange( bool bUndo, const ScCellValue& rText ); void SetChangeTrack( const ScCellValue& rOldCell ); @@ -323,7 +323,7 @@ private: void DoRemoveNote( const ScNoteData& rNoteData ); private: - ScAddress maPos; + ScAddress const maPos; ScNoteData maOldData; ScNoteData maNewData; std::unique_ptr<SdrUndoAction> mpDrawUndo; @@ -344,8 +344,8 @@ public: virtual OUString GetComment() const override; private: - ScAddress maPos; - bool mbShown; + ScAddress const maPos; + bool const mbShown; }; class ScUndoDetective: public ScSimpleUndo @@ -389,7 +389,7 @@ public: private: std::unique_ptr<ScRangeName> pOldRanges; std::unique_ptr<ScRangeName> pNewRanges; - SCTAB mnTab; + SCTAB const mnTab; void DoChange( bool bUndo ); }; @@ -398,7 +398,7 @@ namespace sc { class UndoSetCells : public ScSimpleUndo { - ScAddress maTopPos; + ScAddress const maTopPos; CellValues maOldValues; CellValues maNewValues; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 18b2ba6fd0dd..5a3035d86017 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -57,15 +57,15 @@ public: virtual OUString GetComment() const override; private: - SCCOLROW nStart; - SCCOLROW nEnd; - SCTAB nTab; + SCCOLROW const nStart; + SCCOLROW const nEnd; + SCTAB const nTab; ScDocumentUniquePtr - pUndoDoc; - bool bColumns; - sal_uInt16 nLevel; - sal_uInt16 nEntry; - bool bShow; + pUndoDoc; + bool const bColumns; + sal_uInt16 const nLevel; + sal_uInt16 const nEntry; + bool const bShow; }; class ScUndoMakeOutline: public ScSimpleUndo @@ -86,12 +86,12 @@ public: virtual OUString GetComment() const override; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; + ScAddress const aBlockStart; + ScAddress const aBlockEnd; std::unique_ptr<ScOutlineTable> - pUndoTable; - bool bColumns; - bool bMake; + pUndoTable; + bool const bColumns; + bool const bMake; }; class ScUndoOutlineLevel: public ScSimpleUndo @@ -110,13 +110,13 @@ public: virtual OUString GetComment() const override; private: - SCCOLROW nStart; - SCCOLROW nEnd; - SCTAB nTab; - ScDocumentUniquePtr xUndoDoc; + SCCOLROW const nStart; + SCCOLROW const nEnd; + SCTAB const nTab; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; - bool bColumns; - sal_uInt16 nLevel; + bool const bColumns; + sal_uInt16 const nLevel; }; class ScUndoOutlineBlock: public ScSimpleUndo @@ -136,11 +136,11 @@ public: virtual OUString GetComment() const override; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScDocumentUniquePtr xUndoDoc; + ScAddress const aBlockStart; + ScAddress const aBlockEnd; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; - bool bShow; + bool const bShow; }; class ScUndoRemoveAllOutlines: public ScSimpleUndo @@ -159,9 +159,9 @@ public: virtual OUString GetComment() const override; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScDocumentUniquePtr xUndoDoc; + ScAddress const aBlockStart; + ScAddress const aBlockEnd; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; }; @@ -181,9 +181,9 @@ public: virtual OUString GetComment() const override; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScDocumentUniquePtr xUndoDoc; + ScAddress const aBlockStart; + ScAddress const aBlockEnd; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; }; @@ -203,10 +203,10 @@ public: virtual OUString GetComment() const override; private: - SCTAB nTab; - ScSubTotalParam aParam; // The original passed parameter - SCROW nNewEndRow; // Size of result - ScDocumentUniquePtr xUndoDoc; + SCTAB const nTab; + ScSubTotalParam const aParam; // The original passed parameter + SCROW const nNewEndRow; // Size of result + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScOutlineTable> xUndoTable; std::unique_ptr<ScRangeName> xUndoRange; std::unique_ptr<ScDBCollection> xUndoDB; @@ -230,22 +230,22 @@ public: private: std::unique_ptr<SdrUndoAction> pDrawUndo; - SCTAB nTab; - ScQueryParam aQueryParam; - ScDocumentUniquePtr xUndoDoc; + SCTAB const nTab; + ScQueryParam const aQueryParam; + ScDocumentUniquePtr xUndoDoc; std::unique_ptr<ScDBCollection> xUndoDB; // due to source and target range - ScRange aOldDest; - ScRange aAdvSource; - bool bIsAdvanced; - bool bDestArea; - bool bDoSize; + ScRange aOldDest; + ScRange aAdvSource; + bool bIsAdvanced; + bool bDestArea; + bool const bDoSize; }; class ScUndoAutoFilter: public ScDBFuncUndo { private: - OUString aDBName; - bool bFilterSet; + OUString const aDBName; + bool const bFilterSet; void DoChange( bool bUndo ); @@ -299,16 +299,16 @@ public: virtual OUString GetComment() const override; private: - SCTAB nTab; - ScImportParam aImportParam; - SCCOL nEndCol; - SCROW nEndRow; - ScDocumentUniquePtr xUndoDoc; - ScDocumentUniquePtr xRedoDoc; + SCTAB const nTab; + ScImportParam const aImportParam; + SCCOL const nEndCol; + SCROW const nEndRow; + ScDocumentUniquePtr xUndoDoc; + ScDocumentUniquePtr xRedoDoc; std::unique_ptr<ScDBData> xUndoDBData; std::unique_ptr<ScDBData> xRedoDBData; - SCCOL nFormulaCols; - bool bRedoFilled; + SCCOL const nFormulaCols; + bool bRedoFilled; }; class ScUndoRepeatDB: public ScSimpleUndo @@ -329,17 +329,17 @@ public: virtual OUString GetComment() const override; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - SCROW nNewEndRow; - ScAddress aCursorPos; - ScDocumentUniquePtr xUndoDoc; + ScAddress const aBlockStart; + ScAddress const aBlockEnd; + SCROW const nNewEndRow; + ScAddress const 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 @@ -362,7 +362,7 @@ private: ScDocumentUniquePtr xNewUndoDoc; std::unique_ptr<ScDPObject> xOldDPObject; std::unique_ptr<ScDPObject> xNewDPObject; - bool bAllowMove; + bool const bAllowMove; }; class ScUndoConsolidate: public ScSimpleUndo @@ -382,11 +382,11 @@ public: virtual OUString GetComment() const override; private: - ScArea aDestArea; - ScDocumentUniquePtr xUndoDoc; - ScConsolidateParam aParam; - bool bInsRef; - SCSIZE nInsertCount; + ScArea const aDestArea; + ScDocumentUniquePtr xUndoDoc; + ScConsolidateParam const aParam; + bool const bInsRef; + SCSIZE const nInsertCount; std::unique_ptr<ScOutlineTable> xUndoTab; std::unique_ptr<ScDBData> xUndoData; }; @@ -410,15 +410,15 @@ public: virtual OUString GetComment() const override; private: - OUString aChartName; + OUString const aChartName; ScRangeListRef aOldRangeListRef; bool bOldColHeaders; bool bOldRowHeaders; // ScRange aNewRange; ScRangeListRef aNewRangeListRef; - bool bNewColHeaders; - bool bNewRowHeaders; - bool bAddRange; + bool const bNewColHeaders; + bool const bNewRowHeaders; + bool const bAddRange; void Init(); }; @@ -441,7 +441,7 @@ public: private: std::unique_ptr<ScMarkData> mxMarkData; - ScDocumentUniquePtr xUndoDoc; + ScDocumentUniquePtr const 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 d44827ffad5e..83b3a624a111 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 maParam; + ReorderParam const 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 972905cd031f..c5d5f425a919 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -49,9 +49,9 @@ public: class ScUndoModifyStyle: public ScSimpleUndo { private: - SfxStyleFamily eFamily; - ScStyleSaveData aOldData; - ScStyleSaveData aNewData; + SfxStyleFamily const eFamily; + ScStyleSaveData const aOldData; + ScStyleSaveData const aNewData; static void DoChange( ScDocShell* pDocSh, const OUString& rName, SfxStyleFamily eStyleFamily, @@ -91,13 +91,13 @@ private: struct ApplyStyleEntry { SCTAB mnTab; - OUString maOldStyle; + OUString const maOldStyle; explicit ApplyStyleEntry( SCTAB nTab, const OUString& rOldStyle ); }; typedef ::std::vector< ApplyStyleEntry > ApplyStyleVec; ApplyStyleVec maEntries; - OUString maNewStyle; + OUString const maNewStyle; }; #endif diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 31866fb6a9cc..e7df53065f46 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -55,11 +55,11 @@ public: virtual OUString GetComment() const override; private: - OUString sNewName; + OUString const sNewName; std::unique_ptr<SdrUndoAction> pDrawUndo; - sal_uLong nEndChangeAction; - SCTAB nTab; - bool bAppend; + sal_uLong nEndChangeAction; + SCTAB const nTab; + bool const bAppend; void SetChangeTrack(); }; @@ -84,9 +84,9 @@ private: std::unique_ptr<SdrUndoAction> pDrawUndo; std::vector<OUString> aNameList; - sal_uLong nStartChangeAction; - sal_uLong nEndChangeAction; - SCTAB nTab; + sal_uLong nStartChangeAction; + sal_uLong nEndChangeAction; + SCTAB const nTab; void SetChangeTrack(); }; @@ -134,7 +134,7 @@ public: virtual OUString GetComment() const override; private: - SCTAB nTab; + SCTAB const nTab; OUString sOldName; OUString sNewName; @@ -242,12 +242,12 @@ public: private: std::unique_ptr<ScMarkData> mpMarkData; - SCTAB nSrcTab; - SCTAB nDestTab; - OUString aName; - OUString aComment; - Color aColor; - ScScenarioFlags nFlags; + SCTAB const nSrcTab; + SCTAB const nDestTab; + OUString const aName; + OUString const aComment; + Color const aColor; + ScScenarioFlags const nFlags; std::unique_ptr<SdrUndoAction> pDrawUndo; }; @@ -267,8 +267,8 @@ public: virtual OUString GetComment() const override; private: - SCTAB nTab; - SCTAB nCount; + SCTAB const nTab; + SCTAB const nCount; ScDocumentUniquePtr xRedoDoc; std::unique_ptr<SdrUndoAction> pDrawUndo; @@ -291,7 +291,7 @@ public: virtual OUString GetComment() const override; private: - OUString aDocName; + OUString const aDocName; OUString aFltName; OUString aOptions; sal_uLong nRefreshDelay; @@ -323,8 +323,8 @@ public: virtual OUString GetComment() const override; private: - std::vector<SCTAB> undoTabs; - bool bShow; + std::vector<SCTAB> const undoTabs; + bool const bShow; void DoChange( bool bShow ) const; }; @@ -367,7 +367,7 @@ public: virtual OUString GetComment() const override; private: - SCTAB mnTab; + SCTAB const mnTab; ::std::unique_ptr<ScTableProtection> mpProtectSettings; void DoProtect(bool bProtect); @@ -416,15 +416,15 @@ public: virtual OUString GetComment() const override; private: - SCTAB nTab; - OUString aOldName; - OUString aNewName; - OUString aOldComment; - OUString aNewComment; - Color aOldColor; - Color aNewColor; - ScScenarioFlags nOldFlags; - ScScenarioFlags nNewFlags; + 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; }; class ScUndoRenameObject: public ScSimpleUndo @@ -444,9 +444,9 @@ public: virtual OUString GetComment() const override; private: - OUString aPersistName; // to find object (works only for OLE objects) - OUString aOldName; - OUString aNewName; + OUString const aPersistName; // to find object (works only for OLE objects) + OUString const aOldName; + OUString const aNewName; SdrObject* GetObject(); }; @@ -465,8 +465,8 @@ public: virtual OUString GetComment() const override; private: - SCTAB nTab; - bool bRTL; + SCTAB const nTab; + bool const bRTL; void DoChange( bool bNew ); }; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 1faf86bbd510..413c03c1a505 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -116,12 +116,12 @@ private: VclPtr<formula::RefEdit> m_pEdMax; VclPtr<FixedText> m_pFtHint; /// Hint text for cell range validity. - OUString maStrMin; - OUString maStrMax; - OUString maStrValue; - OUString maStrFormula; - OUString maStrRange; - OUString maStrList; + OUString const maStrMin; + OUString const maStrMax; + OUString const maStrValue; + OUString const maStrFormula; + OUString const maStrRange; + OUString const maStrList; sal_Unicode mcFmlaSep; /// List separator in formulas. DECL_LINK( EditSetFocusHdl, Control&, void ); @@ -171,7 +171,7 @@ class ScValidationDlg { typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase; - ScTabViewShell *m_pTabVwSh; + ScTabViewShell * const m_pTabVwSh; VclPtr<VclHBox> m_pHBox; sal_uInt16 m_nValuePageId; bool m_bOwnRefHdlr:1; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 4e1c5f46a761..80235f836a07 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* pDoc; + ScDocument* const 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 8686a16a468d..54a1e88a9249 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -35,7 +35,7 @@ class ScDataProviderBaseControl : public VclContainer, OUString maURL; OUString maID; - Link<Window*, void> maImportCallback; + Link<Window*, void> const maImportCallback; DECL_LINK(ProviderSelectHdl, ListBox&, void); DECL_LINK(IDEditHdl, Edit&, void); @@ -182,9 +182,9 @@ namespace { struct MenuData { - int nMenuID; + int const nMenuID; const char* aMenuName; - std::function<void(ScDataProviderDlg*)> maCallback; + std::function<void(ScDataProviderDlg*)> const maCallback; }; MenuData aStartData[] = { diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index adad329bb363..9df3f424d885 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -93,7 +93,7 @@ private: bool mbMultiDisable : 1; vcl::EnumContext maContext; - SfxBindings* mpBindings; + SfxBindings* const mpBindings; DECL_LINK( MFLeftIndentMdyHdl, Edit&, void ); DECL_LINK( CBOXMergnCellClkHdl, Button*, void ); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 0618d87286e3..c4d403f26040 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -87,16 +87,16 @@ private: ::sfx2::sidebar::ControllerItem maBorderBLTRControl; // images - Image maIMGCellBorder; - Image maIMGLineStyle1; - Image maIMGLineStyle2; - Image maIMGLineStyle3; - Image maIMGLineStyle4; - Image maIMGLineStyle5; - Image maIMGLineStyle6; - Image maIMGLineStyle7; - Image maIMGLineStyle8; - Image maIMGLineStyle9; + Image const maIMGCellBorder; + Image const maIMGLineStyle1; + Image const maIMGLineStyle2; + Image const maIMGLineStyle3; + Image const maIMGLineStyle4; + Image const maIMGLineStyle5; + Image const maIMGLineStyle6; + Image const maIMGLineStyle7; + Image const maIMGLineStyle8; + Image const maIMGLineStyle9; // BorderStyle defines sal_uInt16 mnInWidth; @@ -130,7 +130,7 @@ private: VclPtr<CellBorderStylePopup> mxCellBorderStylePopup; vcl::EnumContext maContext; - SfxBindings* mpBindings; + SfxBindings* const mpBindings; DECL_LINK(TbxCellBorderSelectHdl, ToolBox*, void); DECL_LINK(TbxLineStyleSelectHdl, ToolBox*, void); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index ce4a7203e91c..b3a9453b5b58 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -83,7 +83,7 @@ private: sal_Int32 mnCategorySelected; vcl::EnumContext maContext; - SfxBindings* mpBindings; + SfxBindings* const mpBindings; DECL_LINK(NumFormatSelectHdl, ListBox&, void); DECL_LINK(NumFormatValueHdl, Edit&, void); diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index a138a097c48e..bc905ef89e63 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 m_bUndoEnabled; + bool const m_bUndoEnabled; public: explicit DisableUndoGuard(ScDocShell *pDocShell) : m_rDoc(pDocShell->GetDocument()) diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 605cc701c9a1..7e4a4faee2fe 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -1320,7 +1320,7 @@ namespace { class DataChangeNotifier { - ScHint maHint; + ScHint const maHint; public: DataChangeNotifier() : maHint(SfxHintId::ScDataChanged, ScAddress()) {} diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 4527177dbb49..0d9e3e7d6747 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -70,7 +70,7 @@ namespace calc ::comphelper::OInterfaceContainerHelper2 m_aModifyListeners; /// our modify listeners bool m_bInitialized; /// has XInitialization::initialize been called? - bool m_bListPos; /// constructed as ListPositionCellBinding? + bool const m_bListPos; /// constructed as ListPositionCellBinding? public: OCellValueBinding( diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 79ec21b2596d..ead395b7f5b8 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -493,7 +493,7 @@ private: GlueType meGlue; SCCOL mnStartCol; SCROW mnStartRow; - ScDocument* mpDoc; + ScDocument* const mpDoc; bool mbColHeaders:1; bool mbRowHeaders:1; bool mbDummyUpperLeft:1; @@ -1334,7 +1334,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScTokenRef>& rRefTokens, class ShrinkRefTokenToDataRange { - ScDocument* mpDoc; + ScDocument* const 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 25647bc747b0..c0126179be85 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 eMode; - sal_Int32 nApiMode; + ScConditionMode const eMode; + sal_Int32 const nApiMode; }; ConditionEntryApiMap aConditionEntryMap[] = @@ -127,8 +127,8 @@ const SfxItemPropertyMapEntry* getColorScalePropSet() struct ColorScaleEntryTypeApiMap { - ScColorScaleEntryType eType; - sal_Int32 nApiType; + ScColorScaleEntryType const eType; + sal_Int32 const nApiType; }; ColorScaleEntryTypeApiMap aColorScaleEntryTypeMap[] = @@ -176,8 +176,8 @@ const SfxItemPropertyMapEntry* getDataBarPropSet() struct DataBarAxisApiMap { - databar::ScAxisPosition ePos; - sal_Int32 nApiPos; + databar::ScAxisPosition const ePos; + sal_Int32 const nApiPos; }; DataBarAxisApiMap aDataBarAxisMap[] = @@ -189,8 +189,8 @@ DataBarAxisApiMap aDataBarAxisMap[] = struct DataBarEntryTypeApiMap { - ScColorScaleEntryType eType; - sal_Int32 nApiType; + ScColorScaleEntryType const eType; + sal_Int32 const nApiType; }; DataBarEntryTypeApiMap aDataBarEntryTypeMap[] = @@ -227,8 +227,8 @@ const SfxItemPropertyMapEntry* getIconSetPropSet() struct IconSetTypeApiMap { - ScIconSetType eType; - sal_Int32 nApiType; + ScIconSetType const eType; + sal_Int32 const nApiType; }; const IconSetTypeApiMap aIconSetApiMap[] = @@ -256,8 +256,8 @@ const IconSetTypeApiMap aIconSetApiMap[] = struct IconSetEntryTypeApiMap { - ScColorScaleEntryType eType; - sal_Int32 nApiType; + ScColorScaleEntryType const eType; + sal_Int32 const nApiType; }; IconSetEntryTypeApiMap aIconSetEntryTypeMap[] = @@ -288,8 +288,8 @@ const SfxItemPropertyMapEntry* getCondDatePropSet() struct DateTypeApiMap { - condformat::ScCondFormatDateType eType; - sal_Int32 nApiType; + condformat::ScCondFormatDateType const eType; + sal_Int32 const nApiType; }; DateTypeApiMap aDateTypeApiMap[] = diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 12d15581ed9f..b0c564daff49 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -388,7 +388,7 @@ class SequencesContainer long& mrDocRow; bool mbOverflow; bool mbArgError; - ScDocument* mpDoc; + ScDocument* const mpDoc; ScTokenArray& mrTokenArr; public: diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 969c93dd69c9..2260f93295a2 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -250,7 +250,7 @@ using Type = ScServiceProvider::Type; struct ProvNamesId_Type { const char * pName; - ScServiceProvider::Type nType; + ScServiceProvider::Type const nType; }; const ProvNamesId_Type aProvNamesId[] = diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index bf0d87d60038..49ce7146ccd1 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -1314,7 +1314,7 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper< container::XNameReplace > { private: - ScShapeObj* mpShape; + ScShapeObj* const mpShape; ScMacroInfo* getInfo( bool bCreate ) { diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 13b586d232b4..583d32ce9502 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -28,8 +28,9 @@ using namespace ooo::vba; using namespace ooo::vba::office::MsoAnimationType; -ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ): ScVbaAssistantImpl_BASE(rParent, rContext), -m_sName( "Clippit" ) +static constexpr OUStringLiteral g_sName = "Clippit"; + +ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ): ScVbaAssistantImpl_BASE(rParent, rContext) { m_bIsVisible = false; m_nPointsLeft = 795; @@ -95,7 +96,7 @@ ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) OUString SAL_CALL ScVbaAssistant::Name( ) { - return m_sName; + return g_sName; } OUString diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index d6d95a6c01c7..25eb414e3025 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -36,7 +36,6 @@ private: bool m_bIsVisible; sal_Int32 m_nPointsLeft; sal_Int32 m_nPointsTop; - OUString m_sName; sal_Int32 m_nAnimation; public: ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ); diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index 88004a31514b..93b92552f36a 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 mnGroup; + sal_Int32 const 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 46dc73a71611..5bf4bdf9b2d9 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -53,7 +53,7 @@ class ScVbaBorder : public ScVbaBorder_Base { private: uno::Reference< beans::XPropertySet > m_xProps; - sal_Int32 m_LineType; + sal_Int32 const 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 9a7bd69229f2..1c7d34d06a23 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 m_aPalette; + ScVbaPalette const m_aPalette; // Add because of MSO has different behavior. - bool bReplace; + bool const 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 400f6459fa3b..5225cb722dc1 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -172,7 +172,7 @@ private: ::osl::Mutex maMutex; ScVbaEventsHelper& mrVbaEvents; uno::Reference< frame::XModel > mxModel; - ScDocShell* mpDocShell; + ScDocShell* const 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 202eefa020e0..f35a227dc84b 100644 --- a/sc/source/ui/vba/vbafiledialog.hxx +++ b/sc/source/ui/vba/vbafiledialog.hxx @@ -30,7 +30,7 @@ typedef InheritedHelperInterfaceWeakImpl< ov::excel::XFileDialog > ScVbaFileDial class ScVbaFileDialog : public ScVbaFileDialog_BASE { private: - sal_Int32 m_nType; + sal_Int32 const 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 35c0891b74b9..5b7e923668d7 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -33,7 +33,7 @@ typedef cppu::ImplInheritanceHelper< VbaFontBase, ov::excel::XFont > ScVbaFont_B class ScVbaFont : public ScVbaFont_BASE { - ScCellRangeObj* mpRangeObj; + ScCellRangeObj* const 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 d8bbc897e225..e89b516bcdc1 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -37,7 +37,7 @@ template< typename... Ifc > class ScVbaFormat : public InheritedHelperInterfaceWeakImpl< Ifc... > { typedef InheritedHelperInterfaceWeakImpl< Ifc... > ScVbaFormat_BASE; - css::lang::Locale m_aDefaultLocale; + css::lang::Locale const m_aDefaultLocale; protected: css::uno::Reference< css::beans::XPropertySet > mxPropertySet; css::uno::Reference< css::util::XNumberFormatsSupplier > mxNumberFormatsSupplier; @@ -45,7 +45,7 @@ protected: css::uno::Reference< css::util::XNumberFormatTypes > xNumberFormatTypes; css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::beans::XPropertyState > xPropertyState; - bool mbCheckAmbiguoity; + bool const 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 7e46e38a1c6d..a1b613442b20 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 mnType; + sal_Int32 const 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 4d253d7c0e87..6840997b245f 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* m_pScDoc; + ScDocument* const 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 3ffea92358ff..268a4f77a669 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -30,7 +30,7 @@ private: uno::Reference< XHelperInterface > mxParent; uno::Reference< uno::XComponentContext > mxContext; uno::Reference< sheet::XSheetPageBreak > mxSheetPageBreak; - bool m_bColumn; + bool const 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 8a643837488e..bb76ee8e9f75 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* m_pShell; + SfxObjectShell* const 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 a806f89ddade..2c2fd50ccbab 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -337,8 +337,8 @@ public: class RangesEnumerationImpl : public EnumerationHelperImpl { - bool mbIsRows; - bool mbIsColumns; + bool const mbIsRows; + bool const 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 ) {} @@ -350,8 +350,8 @@ public: class ScVbaRangeAreas : public ScVbaCollectionBaseImpl { - bool mbIsRows; - bool mbIsColumns; + bool const mbIsRows; + bool const 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 ) {} @@ -594,9 +594,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 m_nRow; -sal_Int32 m_nCol; -sal_Int32 m_nArea; +sal_Int32 const m_nRow; +sal_Int32 const m_nCol; +sal_Int32 const m_nArea; }; typedef ::cppu::WeakImplHelper< container::XEnumeration > CellsEnumeration_BASE; @@ -610,7 +610,7 @@ typedef ::std::vector< CellPos > vCellPos; class ColumnsRowEnumeration: public CellsEnumeration_BASE { uno::Reference< excel::XRange > mxRange; - sal_Int32 mMaxElems; + sal_Int32 const mMaxElems; sal_Int32 mCurElem; public: @@ -697,7 +697,7 @@ static const char CELLSTYLE[] = "CellStyle"; class CellValueSetter : public ValueSetter { protected: - uno::Any maValue; + uno::Any const maValue; public: explicit CellValueSetter( const uno::Any& aValue ); virtual bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) override; @@ -859,8 +859,8 @@ void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< class CellFormulaValueSetter : public CellValueSetter { private: - ScDocument* m_pDoc; - formula::FormulaGrammar::Grammar m_eGrammar; + ScDocument* const m_pDoc; + formula::FormulaGrammar::Grammar const m_eGrammar; public: CellFormulaValueSetter( const uno::Any& aValue, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ):CellValueSetter( aValue ), m_pDoc( pDoc ), m_eGrammar( eGram ){} protected: @@ -908,8 +908,8 @@ protected: class CellFormulaValueGetter : public CellValueGetter { private: - ScDocument* m_pDoc; - formula::FormulaGrammar::Grammar m_eGrammar; + ScDocument* const m_pDoc; + formula::FormulaGrammar::Grammar const 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 67e83f5e7aab..52ec4ac70e3e 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -80,8 +80,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 mbIsRows; - bool mbIsColumns; + bool const mbIsRows; + bool const 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 481490f97ae8..357309e1a0f5 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 maPalette; + ScVbaPalette const maPalette; css::uno::Reference< css::beans::XPropertySet > mxPropSet; sal_Int32 mnStart; sal_Int32 mnLength; @@ -122,7 +122,7 @@ protected: virtual void implSetDefaultProperties(); protected: - ScVbaPalette maPalette; + ScVbaPalette const 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 e70dd8220bb4..e5fb39b4abfa 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -386,7 +386,7 @@ protected: protected: uno::Reference< container::XIndexContainer > mxFormIC; - OUString maModelServiceName; + OUString const maModelServiceName; sal_Int16 /* css::form::FormComponentType */ meType; }; diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index 228c57553c72..240fa21bd9e6 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -40,7 +40,7 @@ protected: css::uno::Reference< css::drawing::XShape > xTitleShape; css::uno::Reference< css::beans::XPropertySet > xShapePropertySet; std::unique_ptr<ov::ShapeHelper> oShapeHelper; - ScVbaPalette m_Palette; + ScVbaPalette const 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 1ed953d9e778..2edd688eea8e 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -96,7 +96,7 @@ public: class WindowEnumImpl : public WindowComponentEnumImpl { - uno::Any m_aApplication; + uno::Any const 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 a74bb99e49b2..8baad38731e2 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -1637,7 +1637,7 @@ static void lcl_MoveToEnd( ScDPSaveDimension& rDim, const OUString& rItemName ) struct ScOUStringCollate { - CollatorWrapper* mpCollator; + CollatorWrapper* const mpCollator; explicit ScOUStringCollate(CollatorWrapper* pColl) : mpCollator(pColl) {} diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index b3cb3e660f2a..ef904f54b97f 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -285,7 +285,7 @@ public: class CopyRangeData { ScDocument* mpSrc; - ScDocument* mpDest; + ScDocument* const 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 fdcdf2da7e5b..14df2e3676aa 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -200,13 +200,13 @@ class ScFilterListBox : public ListBox { private: VclPtr<ScGridWindow> pGridWin; - SCCOL nCol; - SCROW nRow; + SCCOL const nCol; + SCROW const nRow; bool bInit; bool bCancelled; bool bInSelect; sal_uLong nSel; - ScFilterBoxMode eMode; + ScFilterBoxMode const eMode; protected: void SelectHdl(); @@ -565,7 +565,7 @@ struct AutoFilterData : public ScCheckListMenuWindow::ExtendedData class AutoFilterAction : public ScMenuFloatingWindow::Action { VclPtr<ScGridWindow> mpWindow; - ScGridWindow::AutoFilterMode meMode; + ScGridWindow::AutoFilterMode const meMode; public: AutoFilterAction(ScGridWindow* p, ScGridWindow::AutoFilterMode eMode) : mpWindow(p), meMode(eMode) {} @@ -578,7 +578,7 @@ public: class AutoFilterPopupEndAction : public ScMenuFloatingWindow::Action { VclPtr<ScGridWindow> mpWindow; - ScAddress maPos; + ScAddress const 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 4adfc1e32f5d..3864714bb752 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -427,9 +427,9 @@ public: } private: - ScDPObject* mpDPObject; - long mnDimIndex; - SortType meType; + ScDPObject* const mpDPObject; + long const mnDimIndex; + SortType const meType; sal_uInt16 mnUserListIndex; ScTabViewShell* mpViewShell; }; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 40c66bb6de99..a9023e063411 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -123,7 +123,7 @@ class ScDrawStringsVars bool bRepeat; bool bShrink; - bool bPixelToLogic; + bool const bPixelToLogic; bool bCellContrast; Color aBackConfigColor; // used for ScPatternAttr::GetFont calls @@ -2793,7 +2793,7 @@ public: private: tools::Rectangle maRect; VclPtr<OutputDevice> mpDev; - bool mbMetaFile; + bool const 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 6f6aea7aeb2d..259c5786ea6e 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -40,11 +40,11 @@ enum ScPreviewLocationType struct ScPreviewLocationEntry { - ScPreviewLocationType eType; - tools::Rectangle aPixelRect; - ScRange aCellRange; - bool bRepeatCol; - bool bRepeatRow; + ScPreviewLocationType const eType; + tools::Rectangle const aPixelRect; + ScRange const aCellRange; + bool const bRepeatCol; + bool const 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 342a84755220..d4e88c791f21 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -103,7 +103,7 @@ void ScTabViewShell::ConnectObject( const SdrOle2Obj* pObj ) class PopupCallback : public cppu::WeakImplHelper<css::awt::XCallback> { ScTabViewShell* m_pViewShell; - SdrOle2Obj* m_pObject; + SdrOle2Obj* const m_pObject; public: explicit PopupCallback(ScTabViewShell* pViewShell, SdrOle2Obj* pObject) |