[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 15 05:56:25 UTC 2018
sc/inc/AccessibleFilterMenuItem.hxx | 2
sc/inc/ChartTools.hxx | 2
sc/inc/PivotTableDataProvider.hxx | 2
sc/inc/PivotTableDataSequence.hxx | 6
sc/inc/TablePivotChart.hxx | 4
sc/inc/TablePivotCharts.hxx | 2
sc/inc/addincol.hxx | 14
sc/inc/addruno.hxx | 2
sc/inc/afmtuno.hxx | 8
sc/inc/appluno.hxx | 2
sc/inc/attarray.hxx | 2
sc/inc/autonamecache.hxx | 2
sc/inc/brdcst.hxx | 2
sc/inc/callform.hxx | 10
sc/inc/cellsuno.hxx | 8
sc/inc/cellvalues.hxx | 4
sc/inc/chart2uno.hxx | 4
sc/inc/chartlis.hxx | 2
sc/inc/chartpos.hxx | 8
sc/inc/chartuno.hxx | 6
sc/inc/chgtrack.hxx | 8
sc/inc/clipcontext.hxx | 12
sc/inc/colorscale.hxx | 4
sc/inc/column.hxx | 2
sc/inc/columniterator.hxx | 2
sc/inc/columnspanset.hxx | 6
sc/inc/compiler.hxx | 14
sc/inc/confuno.hxx | 2
sc/inc/dapiuno.hxx | 10
sc/inc/datamapper.hxx | 2
sc/inc/datauno.hxx | 10
sc/inc/defaultsoptions.hxx | 2
sc/inc/defltuno.hxx | 2
sc/inc/detdata.hxx | 2
sc/inc/detfunc.hxx | 2
sc/inc/dociter.hxx | 50 +-
sc/inc/docoptio.hxx | 2
sc/inc/document.hxx | 10
sc/inc/docuno.hxx | 18
sc/inc/dpfilteredcache.hxx | 2
sc/inc/dpgroup.hxx | 2
sc/inc/dpobject.hxx | 12
sc/inc/dpoutput.hxx | 2
sc/inc/dpoutputgeometry.hxx | 4
sc/inc/dpresfilter.hxx | 4
sc/inc/dptabres.hxx | 16
sc/inc/dptabsrc.hxx | 30 -
sc/inc/drwlayer.hxx | 18
sc/inc/editdataarray.hxx | 6
sc/inc/editsrc.hxx | 4
sc/inc/editutil.hxx | 20 -
sc/inc/eventuno.hxx | 2
sc/inc/externalrefmgr.hxx | 6
sc/inc/fielduno.hxx | 4
sc/inc/fillinfo.hxx | 2
sc/inc/fmtuno.hxx | 2
sc/inc/formulagroup.hxx | 12
sc/inc/formulaiter.hxx | 2
sc/inc/formulalogger.hxx | 2
sc/inc/formulaopt.hxx | 2
sc/inc/formularesult.hxx | 2
sc/inc/funcdesc.hxx | 2
sc/inc/funcuno.hxx | 2
sc/inc/grouparealistener.hxx | 4
sc/inc/hints.hxx | 26 -
sc/inc/linkuno.hxx | 24 -
sc/inc/listenercontext.hxx | 2
sc/inc/lookupcache.hxx | 10
sc/inc/miscuno.hxx | 2
sc/inc/nameuno.hxx | 4
sc/inc/notesuno.hxx | 2
sc/inc/orcusxml.hxx | 2
sc/inc/postit.hxx | 2
sc/inc/printopt.hxx | 2
sc/inc/prnsave.hxx | 2
sc/inc/queryparam.hxx | 2
sc/inc/rangenam.hxx | 8
sc/inc/recursionhelper.hxx | 4
sc/inc/reffind.hxx | 6
sc/inc/refhint.hxx | 18
sc/inc/refupdatecontext.hxx | 12
sc/inc/rowheightcontext.hxx | 8
sc/inc/scopetools.hxx | 8
sc/inc/sheetdata.hxx | 14
sc/inc/simpleformulacalc.hxx | 6
sc/inc/srchuno.hxx | 2
sc/inc/styleuno.hxx | 4
sc/inc/subtotal.hxx | 2
sc/inc/tabbgcolor.hxx | 2
sc/inc/targuno.hxx | 2
sc/inc/textuno.hxx | 4
sc/inc/token.hxx | 30 -
sc/inc/tokenstringcontext.hxx | 4
sc/inc/typedstrdata.hxx | 4
sc/inc/undorangename.hxx | 2
sc/inc/unitconv.hxx | 4
sc/inc/unoreflist.hxx | 6
sc/inc/validat.hxx | 2
sc/inc/viewopti.hxx | 2
sc/inc/viewuno.hxx | 4
sc/qa/unit/helper/csv_handler.hxx | 10
sc/qa/unit/helper/qahelper.hxx | 22 -
sc/qa/unit/ucalc.cxx | 12
sc/qa/unit/ucalc.hxx | 2
sc/qa/unit/ucalc_column.cxx | 6
sc/qa/unit/ucalc_condformat.cxx | 4
sc/qa/unit/ucalc_formula.cxx | 48 +-
sc/qa/unit/ucalc_pivottable.cxx | 8
sc/qa/unit/ucalc_sort.cxx | 10
sc/source/core/data/bcaslot.cxx | 8
sc/source/core/data/colorscale.cxx | 2
sc/source/core/data/column.cxx | 48 +-
sc/source/core/data/column2.cxx | 32 -
sc/source/core/data/column3.cxx | 44 +-
sc/source/core/data/column4.cxx | 18
sc/source/core/data/columnspanset.cxx | 2
sc/source/core/data/dociter.cxx | 2
sc/source/core/data/documen2.cxx | 3
sc/source/core/data/documen8.cxx | 6
sc/source/core/data/document.cxx | 4
sc/source/core/data/document10.cxx | 4
sc/source/core/data/documentimport.cxx | 6
sc/source/core/data/dpdimsave.cxx | 4
sc/source/core/data/dpgroup.cxx | 12
sc/source/core/data/dpobject.cxx | 36 -
sc/source/core/data/dpoutput.cxx | 10
sc/source/core/data/dptabres.cxx | 10
sc/source/core/data/dptabsrc.cxx | 2
sc/source/core/data/fillinfo.cxx | 2
sc/source/core/data/formulacell.cxx | 18
sc/source/core/data/funcdesc.cxx | 12
sc/source/core/data/stlpool.cxx | 2
sc/source/core/data/table1.cxx | 4
sc/source/core/data/table2.cxx | 18
sc/source/core/data/table3.cxx | 10
sc/source/core/data/validat.cxx | 5
sc/source/core/inc/adiasync.hxx | 4
sc/source/core/inc/arraysumfunctor.hxx | 2
sc/source/core/inc/bcaslot.hxx | 4
sc/source/core/inc/cellkeytranslator.hxx | 2
sc/source/core/inc/doubleref.hxx | 4
sc/source/core/inc/interpre.hxx | 2
sc/source/core/inc/jumpmatrix.hxx | 4
sc/source/core/inc/poolhelp.hxx | 2
sc/source/core/inc/webservicelink.hxx | 2
sc/source/core/opencl/formulagroupcl.cxx | 14
sc/source/core/opencl/opbase.hxx | 10
sc/source/core/tool/callform.cxx | 2
sc/source/core/tool/cellkeytranslator.cxx | 2
sc/source/core/tool/chartlis.cxx | 2
sc/source/core/tool/compiler.cxx | 2
sc/source/core/tool/dbdata.cxx | 40 +-
sc/source/core/tool/formulalogger.cxx | 4
sc/source/core/tool/interpr1.cxx | 6
sc/source/core/tool/interpr3.cxx | 2
sc/source/core/tool/interpr8.cxx | 2
sc/source/core/tool/queryparam.cxx | 2
sc/source/core/tool/rangelst.cxx | 12
sc/source/core/tool/scmatrix.cxx | 6
sc/source/core/tool/token.cxx | 2
sc/source/core/tool/userlist.cxx | 2
sc/source/filter/excel/xepivot.cxx | 2
sc/source/filter/excel/xepivotxml.cxx | 2
sc/source/filter/excel/xestyle.cxx | 4
sc/source/filter/excel/xlpage.cxx | 6
sc/source/filter/excel/xlstyle.cxx | 6
sc/source/filter/excel/xltoolbar.hxx | 2
sc/source/filter/excel/xltools.cxx | 8
sc/source/filter/inc/XclExpChangeTrack.hxx | 30 -
sc/source/filter/inc/commentsbuffer.hxx | 2
sc/source/filter/inc/condformatbuffer.hxx | 4
sc/source/filter/inc/drawingfragment.hxx | 8
sc/source/filter/inc/eeparser.hxx | 2
sc/source/filter/inc/excdoc.hxx | 4
sc/source/filter/inc/excform.hxx | 2
sc/source/filter/inc/excrecds.hxx | 12
sc/source/filter/inc/expbase.hxx | 2
sc/source/filter/inc/extlstcontext.hxx | 2
sc/source/filter/inc/formulabase.hxx | 6
sc/source/filter/inc/formulabuffer.hxx | 22 -
sc/source/filter/inc/fprogressbar.hxx | 4
sc/source/filter/inc/htmlexp.hxx | 16
sc/source/filter/inc/htmlpars.hxx | 26 -
sc/source/filter/inc/namebuff.hxx | 14
sc/source/filter/inc/orcusfiltersimpl.hxx | 2
sc/source/filter/inc/orcusinterface.hxx | 10
sc/source/filter/inc/pagesettings.hxx | 4
sc/source/filter/inc/pivotcachebuffer.hxx | 2
sc/source/filter/inc/pivottablebuffer.hxx | 2
sc/source/filter/inc/qproform.hxx | 2
sc/source/filter/inc/root.hxx | 2
sc/source/filter/inc/scenariobuffer.hxx | 4
sc/source/filter/inc/sheetdatabuffer.hxx | 4
sc/source/filter/inc/sheetdatacontext.hxx | 4
sc/source/filter/inc/stylesbuffer.hxx | 6
sc/source/filter/inc/stylesfragment.hxx | 2
sc/source/filter/inc/worksheetbuffer.hxx | 6
sc/source/filter/inc/xcl97esc.hxx | 2
sc/source/filter/inc/xcl97rec.hxx | 28 -
sc/source/filter/inc/xecontent.hxx | 20 -
sc/source/filter/inc/xedbdata.hxx | 2
sc/source/filter/inc/xeescher.hxx | 24 -
sc/source/filter/inc/xeextlst.hxx | 12
sc/source/filter/inc/xehelper.hxx | 2
sc/source/filter/inc/xepage.hxx | 4
sc/source/filter/inc/xepivot.hxx | 2
sc/source/filter/inc/xepivotxml.hxx | 4
sc/source/filter/inc/xerecord.hxx | 8
sc/source/filter/inc/xestream.hxx | 2
sc/source/filter/inc/xestyle.hxx | 12
sc/source/filter/inc/xetable.hxx | 20 -
sc/source/filter/inc/xeview.hxx | 8
sc/source/filter/inc/xicontent.hxx | 4
sc/source/filter/inc/xiescher.hxx | 8
sc/source/filter/inc/xiname.hxx | 2
sc/source/filter/inc/xistream.hxx | 4
sc/source/filter/inc/xladdress.hxx | 6
sc/source/filter/inc/xlchart.hxx | 24 -
sc/source/filter/inc/xlformula.hxx | 18
sc/source/filter/inc/xlpivot.hxx | 2
sc/source/filter/inc/xlroot.hxx | 8
sc/source/filter/oox/drawingfragment.cxx | 4
sc/source/filter/oox/excelvbaproject.cxx | 2
sc/source/filter/oox/formulabase.cxx | 14
sc/source/filter/oox/numberformatsbuffer.cxx | 6
sc/source/filter/oox/revisionfragment.cxx | 2
sc/source/filter/oox/worksheethelper.cxx | 2
sc/source/filter/orcus/interface.cxx | 2
sc/source/filter/qpro/qproform.cxx | 4
sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx | 34 -
sc/source/filter/xml/XMLCodeNameProvider.cxx | 15
sc/source/filter/xml/XMLCodeNameProvider.hxx | 4
sc/source/filter/xml/XMLConverter.cxx | 10
sc/source/filter/xml/XMLDDELinksContext.hxx | 2
sc/source/filter/xml/XMLDetectiveContext.hxx | 2
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2
sc/source/filter/xml/XMLExportSharedData.hxx | 2
sc/source/filter/xml/XMLStylesImportHelper.hxx | 4
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 10
sc/source/filter/xml/cachedattraccess.hxx | 4
sc/source/filter/xml/editattributemap.hxx | 6
sc/source/filter/xml/pivotsource.hxx | 12
sc/source/filter/xml/xmlannoi.hxx | 6
sc/source/filter/xml/xmlcelli.hxx | 2
sc/source/filter/xml/xmlcoli.hxx | 4
sc/source/filter/xml/xmlcondformat.hxx | 4
sc/source/filter/xml/xmldpimp.hxx | 2
sc/source/filter/xml/xmlfilti.hxx | 2
sc/source/filter/xml/xmlimprt.cxx | 23 -
sc/source/filter/xml/xmlimprt.hxx | 9
sc/source/filter/xml/xmlnexpi.hxx | 2
sc/source/filter/xml/xmlrowi.hxx | 4
sc/source/filter/xml/xmlstyli.hxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 29 -
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 12
sc/source/ui/Accessibility/AccessibleFilterMenu.cxx | 2
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 22 -
sc/source/ui/dataprovider/dataprovider.cxx | 3
sc/source/ui/dataprovider/htmldataprovider.cxx | 6
sc/source/ui/dataprovider/htmldataprovider.hxx | 2
sc/source/ui/dataprovider/xmldataprovider.cxx | 6
sc/source/ui/dataprovider/xmldataprovider.hxx | 2
sc/source/ui/dbgui/csvgrid.cxx | 4
sc/source/ui/dbgui/scuiasciiopt.cxx | 9
sc/source/ui/docshell/autostyl.cxx | 4
sc/source/ui/docshell/datastream.cxx | 4
sc/source/ui/docshell/docfunc.cxx | 4
sc/source/ui/docshell/documentlinkmgr.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 10
sc/source/ui/inc/AccessibilityHints.hxx | 4
sc/source/ui/inc/AccessibleCellBase.hxx | 2
sc/source/ui/inc/AccessibleContextBase.hxx | 2
sc/source/ui/inc/AccessibleCsvControl.hxx | 6
sc/source/ui/inc/AccessibleDocument.hxx | 2
sc/source/ui/inc/AccessibleEditObject.hxx | 2
sc/source/ui/inc/AccessiblePageHeader.hxx | 4
sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 2
sc/source/ui/inc/AccessiblePreviewTable.hxx | 2
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 2
sc/source/ui/inc/AccessibleTableBase.hxx | 2
sc/source/ui/inc/AccessibleText.hxx | 20 -
sc/source/ui/inc/PivotLayoutDialog.hxx | 8
sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 4
sc/source/ui/inc/SamplingDialog.hxx | 12
sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 16
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 18
sc/source/ui/inc/TableFillingAndNavigationTools.hxx | 12
sc/source/ui/inc/acredlin.hxx | 14
sc/source/ui/inc/anyrefdg.hxx | 4
sc/source/ui/inc/areasave.hxx | 12
sc/source/ui/inc/autostyl.hxx | 8
sc/source/ui/inc/cellmergeoption.hxx | 2
sc/source/ui/inc/colorformat.hxx | 4
sc/source/ui/inc/colrowba.hxx | 4
sc/source/ui/inc/condformatdlgentry.hxx | 2
sc/source/ui/inc/condformatdlgitem.hxx | 4
sc/source/ui/inc/condformatmgr.hxx | 2
sc/source/ui/inc/condformatuno.hxx | 22 -
sc/source/ui/inc/conflictsdlg.hxx | 18
sc/source/ui/inc/consdlg.hxx | 8
sc/source/ui/inc/crnrdlg.hxx | 2
sc/source/ui/inc/csvcontrol.hxx | 2
sc/source/ui/inc/csvgrid.hxx | 2
sc/source/ui/inc/dataprovider.hxx | 6
sc/source/ui/inc/datatransformation.hxx | 32 -
sc/source/ui/inc/dbnamdlg.hxx | 4
sc/source/ui/inc/dpgroupdlg.hxx | 2
sc/source/ui/inc/drwtrans.hxx | 2
sc/source/ui/inc/foptmgr.hxx | 4
sc/source/ui/inc/fupoor.hxx | 2
sc/source/ui/inc/gridmerg.hxx | 4
sc/source/ui/inc/gridwin.hxx | 2
sc/source/ui/inc/hdrcont.hxx | 4
sc/source/ui/inc/hiranges.hxx | 4
sc/source/ui/inc/impex.hxx | 4
sc/source/ui/inc/msgpool.hxx | 2
sc/source/ui/inc/namedefdlg.hxx | 4
sc/source/ui/inc/namemgrtable.hxx | 2
sc/source/ui/inc/navipi.hxx | 6
sc/source/ui/inc/notemark.hxx | 10
sc/source/ui/inc/olinewin.hxx | 4
sc/source/ui/inc/optsolver.hxx | 22 -
sc/source/ui/inc/output.hxx | 32 -
sc/source/ui/inc/pfiltdlg.hxx | 2
sc/source/ui/inc/prevloc.hxx | 2
sc/source/ui/inc/retypepassdlg.hxx | 10
sc/source/ui/inc/rfindlst.hxx | 4
sc/source/ui/inc/scendlg.hxx | 2
sc/source/ui/inc/scuiasciiopt.hxx | 3
sc/source/ui/inc/scuiautofmt.hxx | 10
sc/source/ui/inc/scuiimoptdlg.hxx | 2
sc/source/ui/inc/scuitphfedit.hxx | 2
sc/source/ui/inc/searchresults.hxx | 4
sc/source/ui/inc/sortkeydlg.hxx | 2
sc/source/ui/inc/spelleng.hxx | 4
sc/source/ui/inc/spellparam.hxx | 14
sc/source/ui/inc/tabopdlg.hxx | 2
sc/source/ui/inc/tabview.hxx | 6
sc/source/ui/inc/target.hxx | 2
sc/source/ui/inc/tbzoomsliderctrl.hxx | 2
sc/source/ui/inc/tpcalc.hxx | 2
sc/source/ui/inc/tpsort.hxx | 12
sc/source/ui/inc/uiitems.hxx | 26 -
sc/source/ui/inc/undobase.hxx | 6
sc/source/ui/inc/undoblk.hxx | 213 +++++------
sc/source/ui/inc/undocell.hxx | 66 +--
sc/source/ui/inc/undodat.hxx | 140 +++----
sc/source/ui/inc/undosort.hxx | 2
sc/source/ui/inc/undostyl.hxx | 10
sc/source/ui/inc/undotab.hxx | 68 +--
sc/source/ui/inc/validate.hxx | 14
sc/source/ui/inc/viewdata.hxx | 2
sc/source/ui/miscdlgs/dataproviderdlg.cxx | 6
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 2
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 22 -
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 2
sc/source/ui/undo/undobase.cxx | 2
sc/source/ui/undo/undoblk.cxx | 2
sc/source/ui/unoobj/cellvaluebinding.hxx | 2
sc/source/ui/unoobj/chart2uno.cxx | 4
sc/source/ui/unoobj/condformatuno.cxx | 28 -
sc/source/ui/unoobj/funcuno.cxx | 2
sc/source/ui/unoobj/servuno.cxx | 2
sc/source/ui/unoobj/shapeuno.cxx | 2
sc/source/ui/vba/vbaassistant.cxx | 7
sc/source/ui/vba/vbaassistant.hxx | 1
sc/source/ui/vba/vbaaxis.hxx | 2
sc/source/ui/vba/vbaborders.cxx | 2
sc/source/ui/vba/vbacharacters.hxx | 4
sc/source/ui/vba/vbaeventshelper.cxx | 2
sc/source/ui/vba/vbafiledialog.hxx | 2
sc/source/ui/vba/vbafont.hxx | 2
sc/source/ui/vba/vbaformat.hxx | 4
sc/source/ui/vba/vbahyperlinks.cxx | 2
sc/source/ui/vba/vbainterior.hxx | 2
sc/source/ui/vba/vbapagebreaks.cxx | 2
sc/source/ui/vba/vbapalette.hxx | 2
sc/source/ui/vba/vbarange.cxx | 26 -
sc/source/ui/vba/vbarange.hxx | 4
sc/source/ui/vba/vbasheetobject.hxx | 4
sc/source/ui/vba/vbasheetobjects.cxx | 2
sc/source/ui/vba/vbatitle.hxx | 2
sc/source/ui/vba/vbawindows.cxx | 2
sc/source/ui/view/dbfunc3.cxx | 2
sc/source/ui/view/drawvie4.cxx | 2
sc/source/ui/view/gridwin.cxx | 10
sc/source/ui/view/gridwin2.cxx | 6
sc/source/ui/view/output2.cxx | 4
sc/source/ui/view/prevloc.cxx | 10
sc/source/ui/view/tabvwshb.cxx | 2
svx/source/sdr/contact/viewcontactofe3dlathe.cxx | 6
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 4
svx/source/svdraw/sdrpagewindow.cxx | 4
svx/source/svdraw/svddrgmt.cxx | 4
svx/source/svdraw/svdobj.cxx | 5
svx/source/svdraw/svdopath.cxx | 29 -
svx/source/svdraw/svdotextpathdecomposition.cxx | 4
svx/source/xoutdev/_xpoly.cxx | 5
398 files changed, 1634 insertions(+), 1651 deletions(-)
New commits:
commit fb1d3b580763a333bbbfe115d09e1b5cd8849675
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Oct 11 10:46:10 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Oct 15 07:56:12 2018 +0200
loplugin:constfields in sc
Change-Id: If326175d571d15752efd1b63df45b2bc785f7541
Reviewed-on: https://gerrit.libreoffice.org/61653
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index 319903a844dc..6e8784b8f535 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -89,7 +89,7 @@ private:
css::uno::Reference< css::accessibility::XAccessibleStateSet > mxStateSet;
VclPtr<ScMenuFloatingWindow> mpWindow;
- size_t mnMenuPos;
+ size_t const mnMenuPos;
};
#endif
diff --git a/sc/inc/ChartTools.hxx b/sc/inc/ChartTools.hxx
index 736142a056c6..af0a4e807827 100644
--- a/sc/inc/ChartTools.hxx
+++ b/sc/inc/ChartTools.hxx
@@ -35,7 +35,7 @@ class ChartIterator
{
private:
std::unique_ptr<SdrObjListIter> m_pIterator;
- ChartSourceType m_eChartSourceType;
+ ChartSourceType const m_eChartSourceType;
public:
ChartIterator(ScDocShell* pDocShell, SCTAB nTab, ChartSourceType eChartSourceType);
SdrOle2Obj* next();
diff --git a/sc/inc/PivotTableDataProvider.hxx b/sc/inc/PivotTableDataProvider.hxx
index 1403dfdad3d2..4f803e204e27 100644
--- a/sc/inc/PivotTableDataProvider.hxx
+++ b/sc/inc/PivotTableDataProvider.hxx
@@ -157,7 +157,7 @@ private:
ScDocument* m_pDocument;
OUString m_sPivotTableName;
- SfxItemPropertySet m_aPropSet;
+ SfxItemPropertySet const m_aPropSet;
bool m_bIncludeHiddenCells;
std::vector<std::vector<ValueAndFormat>> m_aCategoriesColumnOrientation;
diff --git a/sc/inc/PivotTableDataSequence.hxx b/sc/inc/PivotTableDataSequence.hxx
index 8448edcc5a9e..b834e4ae81c5 100644
--- a/sc/inc/PivotTableDataSequence.hxx
+++ b/sc/inc/PivotTableDataSequence.hxx
@@ -156,10 +156,10 @@ public:
private:
ScDocument* m_pDocument;
- OUString m_sPivotTableName;
- OUString m_aID;
+ OUString const m_sPivotTableName;
+ OUString const m_aID;
std::vector<ValueAndFormat> m_aData;
- SfxItemPropertySet m_aPropSet;
+ SfxItemPropertySet const m_aPropSet;
css::chart2::data::DataSequenceRole m_aRole;
std::vector<css::uno::Reference<css::util::XModifyListener>> m_aValueListeners;
};
diff --git a/sc/inc/TablePivotChart.hxx b/sc/inc/TablePivotChart.hxx
index b94886bcf96f..a99711c37845 100644
--- a/sc/inc/TablePivotChart.hxx
+++ b/sc/inc/TablePivotChart.hxx
@@ -37,8 +37,8 @@ class TablePivotChart : public cppu::BaseMutex,
{
private:
ScDocShell* m_pDocShell;
- SCTAB m_nTab; // Charts are per sheet
- OUString m_aChartName;
+ SCTAB const m_nTab; // Charts are per sheet
+ OUString const m_aChartName;
public:
TablePivotChart(ScDocShell* pDocShell, SCTAB nTab, OUString const & rName);
diff --git a/sc/inc/TablePivotCharts.hxx b/sc/inc/TablePivotCharts.hxx
index b5c9deab92d6..2e8d8f4deb8e 100644
--- a/sc/inc/TablePivotCharts.hxx
+++ b/sc/inc/TablePivotCharts.hxx
@@ -32,7 +32,7 @@ class TablePivotCharts : public TablePivotCharts_Base, public SfxListener
{
private:
ScDocShell* m_pDocShell;
- SCTAB m_nTab;
+ SCTAB const m_nTab;
public:
TablePivotCharts(ScDocShell* pDocShell, SCTAB nTab);
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 46de0b84c7ef..1da45b96d55e 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -81,19 +81,19 @@ public:
: maLocale( rLocale), maName( rName) { }
};
private:
- OUString aOriginalName; ///< kept in formula
- OUString aLocalName; ///< for display
- OUString aUpperName; ///< for entering formulas
- OUString aUpperLocal; ///< for entering formulas
- OUString aDescription;
+ OUString const aOriginalName; ///< kept in formula
+ OUString const aLocalName; ///< for display
+ OUString aUpperName; ///< for entering formulas
+ OUString aUpperLocal; ///< for entering formulas
+ OUString const aDescription;
css::uno::Reference< css::reflection::XIdlMethod> xFunction;
css::uno::Any aObject;
long nArgCount;
std::unique_ptr<ScAddInArgDesc[]>
pArgDescs;
long nCallerPos;
- sal_uInt16 nCategory;
- OString sHelpId;
+ sal_uInt16 const nCategory;
+ OString const sHelpId;
mutable ::std::vector< LocalizedName > maCompNames;
mutable bool bCompInitialized;
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx
index 095ddf6012d0..62a0e7c8b0b8 100644
--- a/sc/inc/addruno.hxx
+++ b/sc/inc/addruno.hxx
@@ -35,7 +35,7 @@ private:
ScDocShell* pDocShell;
ScRange aRange;
sal_Int32 nRefSheet;
- bool bIsRange;
+ bool const bIsRange;
bool ParseUIString( const OUString& rUIString, ::formula::FormulaGrammar::AddressConvention eConv = ::formula::FormulaGrammar::CONV_OOO );
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index cdb1500f1f48..5e13886815d7 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -90,7 +90,7 @@ class ScAutoFormatObj : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
sal_uInt16 nFormatIndex;
ScAutoFormatFieldObj* GetObjectByIndex_Impl(sal_uInt16 nIndex);
@@ -157,9 +157,9 @@ class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet aPropSet;
- sal_uInt16 nFormatIndex;
- sal_uInt16 nFieldIndex;
+ SfxItemPropertySet const aPropSet;
+ sal_uInt16 const nFormatIndex;
+ sal_uInt16 const nFieldIndex;
public:
ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField);
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 15bb4d987920..0e923500cb34 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -84,7 +84,7 @@ class ScSpreadsheetSettings : public cppu::WeakImplHelper<
css::lang::XServiceInfo>
{
private:
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
/// @throws css::uno::RuntimeException
bool getPropertyBool(const OUString& aPropertyName);
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index fc933d9c2f8f..d2ca2d7c842f 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -220,7 +220,7 @@ class ScAttrIterator
const ScPatternAttr* pDefPattern;
SCSIZE nPos;
SCROW nRow;
- SCROW nEndRow;
+ SCROW const nEndRow;
public:
inline ScAttrIterator( const ScAttrArray* pNewArray, SCROW nStart, SCROW nEnd, const ScPatternAttr* pDefaultPattern );
inline const ScPatternAttr* Next( SCROW& rTop, SCROW& rBottom );
diff --git a/sc/inc/autonamecache.hxx b/sc/inc/autonamecache.hxx
index 3be8f87c922a..af17d9417e4a 100644
--- a/sc/inc/autonamecache.hxx
+++ b/sc/inc/autonamecache.hxx
@@ -32,7 +32,7 @@ typedef std::unordered_map< OUString, ScAutoNameAddresses > ScAutoNameHashMap;
class SC_DLLPUBLIC ScAutoNameCache
{
ScAutoNameHashMap aNames;
- ScDocument* pDoc;
+ ScDocument* const pDoc;
SCTAB nCurrentTab;
public:
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index a05b95f55a06..34d7d0394a7c 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -35,7 +35,7 @@ public:
class ScAreaChangedHint : public SfxHint
{
private:
- ScRange aNewRange;
+ ScRange const aNewRange;
public:
ScAreaChangedHint(const ScRange& rRange) : aNewRange(rRange) {}
const ScRange& GetRange() const { return aNewRange; }
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx
index fd85ab1122b2..d64f9dfd5fe0 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -55,11 +55,11 @@ class LegacyFuncData
friend class LegacyFuncCollection;
const ModuleData* pModuleData;
- OUString aInternalName;
- OUString aFuncName;
- sal_uInt16 nNumber;
- sal_uInt16 nParamCount;
- ParamType eAsyncType;
+ OUString const aInternalName;
+ OUString const aFuncName;
+ sal_uInt16 const nNumber;
+ sal_uInt16 const nParamCount;
+ ParamType const eAsyncType;
ParamType eParamType[MAXFUNCPARAM];
public:
LegacyFuncData(const ModuleData*pModule,
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index d36e7442bbb7..865a5d5433b0 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -118,7 +118,7 @@ namespace editeng { class SvxBorderLine; }
class ScLinkListener : public SvtListener
{
- Link<const SfxHint&,void> aLink;
+ Link<const SfxHint&,void> const aLink;
public:
ScLinkListener(const Link<const SfxHint&,void>& rL) : aLink(rL) {}
virtual ~ScLinkListener() override;
@@ -1114,7 +1114,7 @@ class ScCellFormatsObj : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- ScRange aTotalRange;
+ ScRange const aTotalRange;
private:
ScCellRangeObj* GetObjectByIndex_Impl(long nIndex) const;
@@ -1150,7 +1150,7 @@ class ScCellFormatsEnumeration : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB nTab;
+ SCTAB const nTab;
std::unique_ptr<ScAttrRectIterator> pIter;
ScRange aNext;
bool bAtEnd;
@@ -1186,7 +1186,7 @@ class ScUniqueCellFormatsObj : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- ScRange aTotalRange;
+ ScRange const aTotalRange;
ScMyRangeLists aRangeLists;
public:
diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx
index 7cc64bfc98ac..431239835271 100644
--- a/sc/inc/cellvalues.hxx
+++ b/sc/inc/cellvalues.hxx
@@ -28,8 +28,8 @@ struct CellValuesImpl;
struct CellValueSpan
{
- SCROW mnRow1;
- SCROW mnRow2;
+ SCROW const mnRow1;
+ SCROW const mnRow2;
CellValueSpan( SCROW nRow1, SCROW nRow2 );
};
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 254934c1d1c4..91eaf12ff408 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -144,7 +144,7 @@ public:
private:
ScDocument* m_pDocument;
- SfxItemPropertySet m_aPropSet;
+ SfxItemPropertySet const m_aPropSet;
bool m_bIncludeHiddenCells;
};
@@ -376,7 +376,7 @@ private:
RangeIndexMapPtr m_pRangeIndices;
ExtRefListenerPtr m_pExtRefListener;
css::uno::Reference < css::chart2::data::XDataProvider > m_xDataProvider;
- SfxItemPropertySet m_aPropSet;
+ SfxItemPropertySet const m_aPropSet;
std::unique_ptr<HiddenRangeListener> m_pHiddenListener;
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index a03fa57457ef..4541e5c05ba3 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -64,7 +64,7 @@ private:
std::unique_ptr<ExternalRefListener> mpExtRefListener;
std::unique_ptr<std::vector<ScTokenRef> > mpTokens;
- OUString maName;
+ OUString const maName;
std::unique_ptr<ScChartUnoData> pUnoData;
ScDocument* mpDoc;
bool bUsed:1; // for ScChartListenerCollection::FreeUnused
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index 0069b1a80c50..ac79b8fb8ee8 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -37,9 +37,9 @@ class ScChartPositionMap
std::unique_ptr<std::unique_ptr<ScAddress>[]> ppData;
std::unique_ptr<std::unique_ptr<ScAddress>[]> ppColHeader;
std::unique_ptr<std::unique_ptr<ScAddress>[]> ppRowHeader;
- sal_uLong nCount;
- SCCOL nColCount;
- SCROW nRowCount;
+ sal_uLong const nCount;
+ SCCOL const nColCount;
+ SCROW const nRowCount;
ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows,
SCCOL nColAdd, // header columns
@@ -103,7 +103,7 @@ class ScDocument;
class ScChartPositioner final // only parameter struct
{
ScRangeListRef aRangeListRef;
- ScDocument* pDocument;
+ ScDocument* const pDocument;
std::unique_ptr<ScChartPositionMap> pPositionMap;
ScChartGlue eGlue;
SCCOL nStartCol;
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 1dd16cf7a224..801a9d99db93 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -47,7 +47,7 @@ class ScChartsObj : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB nTab; // Charts are per sheet
+ SCTAB const nTab; // Charts are per sheet
ScChartObj* GetObjectByIndex_Impl(long nIndex) const;
ScChartObj* GetObjectByName_Impl(const OUString& aName) const;
@@ -105,8 +105,8 @@ class ScChartObj : public ::cppu::BaseMutex
{
private:
ScDocShell* pDocShell;
- SCTAB nTab; // Charts are per sheet
- OUString aChartName;
+ SCTAB const nTab; // Charts are per sheet
+ OUString const aChartName;
void Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, bool bRowHeaders );
void GetData_Impl( ScRangeListRef& rRanges, bool& rColHeaders, bool& rRowHeaders ) const;
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index e39920bfe5c0..83caceac4262 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -105,7 +105,7 @@ protected:
ScChangeActionLinkEntry* pNext;
ScChangeActionLinkEntry** ppPrev;
- ScChangeAction* pAction;
+ ScChangeAction* const pAction;
ScChangeActionLinkEntry* pLink;
public:
@@ -364,7 +364,7 @@ class ScChangeActionIns : public ScChangeAction
{
friend class ScChangeTrack;
- bool mbEndOfList; /// whether or not a row was auto-inserted at the bottom.
+ bool const mbEndOfList; /// whether or not a row was auto-inserted at the bottom.
ScChangeActionIns( const ScRange& rRange, bool bEndOfList = false );
@@ -402,8 +402,8 @@ class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry
friend class ScChangeActionDel;
friend class ScChangeTrack;
- short nCutOffFrom;
- short nCutOffTo;
+ short const nCutOffFrom;
+ short const nCutOffTo;
inline ScChangeActionDelMoveEntry(
ScChangeActionDelMoveEntry** ppPrevP,
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 629d6a2b22dc..f2a7af56818b 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -51,9 +51,9 @@ class CopyFromClipContext : public ClipContextBase
SCTAB mnTabStart;
SCTAB mnTabEnd;
ScDocument& mrDestDoc;
- ScDocument* mpRefUndoDoc;
+ ScDocument* const mpRefUndoDoc;
ScDocument* mpClipDoc;
- InsertDeleteFlags mnInsertFlag;
+ InsertDeleteFlags const mnInsertFlag;
InsertDeleteFlags mnDeleteFlag;
std::vector<ScCellValue> maSingleCells;
@@ -62,9 +62,9 @@ class CopyFromClipContext : public ClipContextBase
std::vector<const ScPostIt*> maSingleNotes;
ScConditionalFormatList* mpCondFormatList;
- bool mbAsLink:1;
- bool mbSkipAttrForEmptyCells:1;
- bool mbCloneNotes:1;
+ bool const mbAsLink:1;
+ bool const mbSkipAttrForEmptyCells:1;
+ bool const mbCloneNotes:1;
bool mbTableProtected:1;
public:
@@ -132,7 +132,7 @@ public:
class CopyToClipContext : public ClipContextBase
{
- bool mbKeepScenarioFlags:1;
+ bool const mbKeepScenarioFlags:1;
public:
CopyToClipContext(ScDocument& rDoc, bool bKeepScenarioFlags);
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index aa44ed87207e..22ae90092a86 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -214,8 +214,8 @@ enum ScIconSetType
struct ScIconSetMap {
const char* pName;
- ScIconSetType eType;
- sal_Int32 nElements;
+ ScIconSetType const eType;
+ sal_Int32 const nElements;
};
class SC_DLLPUBLIC ScColorFormat : public ScFormatEntry
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 3692a3a188ed..915b1aa22644 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -125,7 +125,7 @@ class ScColumn
// Broadcasters for formula cells.
sc::BroadcasterStoreType maBroadcasters;
- sc::CellStoreEvent maCellsEvent;
+ sc::CellStoreEvent const maCellsEvent;
// Cell values.
sc::CellStoreType maCells;
diff --git a/sc/inc/columniterator.hxx b/sc/inc/columniterator.hxx
index b62510ac380a..51270f363ea7 100644
--- a/sc/inc/columniterator.hxx
+++ b/sc/inc/columniterator.hxx
@@ -66,7 +66,7 @@ namespace sc {
class ColumnIterator
{
CellStoreType::const_position_type maPos;
- CellStoreType::const_position_type maPosEnd;
+ CellStoreType::const_position_type const maPosEnd;
bool mbComplete;
public:
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 4eb83b916deb..a62bf6aec9f9 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -27,8 +27,8 @@ class SingleColumnSpanSet;
struct RowSpan
{
- SCROW mnRow1;
- SCROW mnRow2;
+ SCROW const mnRow1;
+ SCROW const mnRow2;
RowSpan(SCROW nRow1, SCROW nRow2);
};
@@ -62,7 +62,7 @@ private:
typedef std::vector<std::unique_ptr<ColumnType>> TableType;
std::vector<std::unique_ptr<TableType>> maTables;
- bool mbInit;
+ bool const mbInit;
ColumnType& getColumn(SCTAB nTab, SCCOL nCol);
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 5d8f10a8de4e..c7471e4827a2 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -124,13 +124,13 @@ public:
} name;
struct {
sal_uInt16 nIndex;
- ScTableRefToken::Item eItem;
- } table;
+ ScTableRefToken::Item const eItem;
+ } const table;
struct {
rtl_uString* mpData;
rtl_uString* mpDataIgnoreCase;
} sharedstring;
- ScMatrix* pMat;
+ ScMatrix* const pMat;
FormulaError nError;
short nJump[ FORMULA_MAXJUMPCOUNT + 1 ]; // If/Chose token
};
@@ -291,7 +291,7 @@ private:
struct TableRefEntry
{
- ScTokenRef mxToken;
+ ScTokenRef const mxToken;
sal_uInt16 mnLevel;
TableRefEntry( formula::FormulaToken* p ) : mxToken(p), mnLevel(0) {}
};
@@ -303,9 +303,9 @@ private:
{
PendingImplicitIntersectionOptimization(formula::FormulaToken** p, formula::FormulaToken* o)
: parameterLocation( p ), parameter( *p ), operation( o ) {}
- formula::FormulaToken** parameterLocation;
- formula::FormulaTokenRef parameter;
- formula::FormulaTokenRef operation;
+ formula::FormulaToken** const parameterLocation;
+ formula::FormulaTokenRef const parameter;
+ formula::FormulaTokenRef const operation;
};
std::vector< PendingImplicitIntersectionOptimization > mPendingImplicitIntersectionOptimizations;
std::set<formula::FormulaTokenRef> mUnhandledPossibleImplicitIntersections;
diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx
index 0d1f5a7919d0..6aa970e3efcf 100644
--- a/sc/inc/confuno.hxx
+++ b/sc/inc/confuno.hxx
@@ -35,7 +35,7 @@ class ScDocumentConfiguration : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
public:
ScDocumentConfiguration(ScDocShell* pDocShell);
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 619585224f08..872745086d98 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -85,7 +85,7 @@ class ScDataPilotTablesObj : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB nTab;
+ SCTAB const nTab;
ScDataPilotTableObj* GetObjectByIndex_Impl( sal_Int32 nIndex );
ScDataPilotTableObj* GetObjectByName_Impl(const OUString& aName);
@@ -138,7 +138,7 @@ class ScDataPilotDescriptorBase : public css::sheet::XDataPilotDescriptor,
public SfxListener
{
private:
- SfxItemPropertySet maPropSet;
+ SfxItemPropertySet const maPropSet;
ScDocShell* pDocShell;
public:
@@ -388,7 +388,7 @@ private:
ScDataPilotFieldObj* GetObjectByName_Impl( const OUString& rName ) const;
private:
- css::uno::Any maOrient; /// Field orientation, no value = all fields.
+ css::uno::Any const maOrient; /// Field orientation, no value = all fields.
};
typedef ::cppu::WeakImplHelper
@@ -480,7 +480,7 @@ public:
private:
css::uno::Reference< css::container::XIndexAccess >
mxItems;
- SfxItemPropertySet maPropSet;
+ SfxItemPropertySet const maPropSet;
css::uno::Any maOrient;
};
@@ -727,7 +727,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
- SfxItemPropertySet maPropSet;
+ SfxItemPropertySet const maPropSet;
sal_Int32 mnIndex;
};
diff --git a/sc/inc/datamapper.hxx b/sc/inc/datamapper.hxx
index c1da6ff83eb4..27bb011521cf 100644
--- a/sc/inc/datamapper.hxx
+++ b/sc/inc/datamapper.hxx
@@ -65,8 +65,6 @@ private:
ScOrcusImportXMLParam maParam;
- double mnUpdateFrequency;
-
std::shared_ptr<DataProvider> mpDataProvider;
std::shared_ptr<ScDBDataManager> mpDBDataManager;
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 5e5037d7cdc8..95b79b220243 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -114,7 +114,7 @@ class ScSubTotalDescriptorBase : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
ScSubTotalFieldObj* GetObjectByIndex_Impl(sal_uInt16 nIndex);
@@ -283,7 +283,7 @@ class ScFilterDescriptorBase : public cppu::WeakImplHelper<
public SfxListener
{
private:
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
ScDocShell* pDocSh;
public:
@@ -405,11 +405,11 @@ class ScDatabaseRangeObj : public cppu::WeakImplHelper<
private:
ScDocShell* pDocShell;
OUString aName;
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
std::vector< css::uno::Reference< css::util::XRefreshListener > >
aRefreshListeners;
- bool bIsUnnamed;
- SCTAB aTab;
+ bool const bIsUnnamed;
+ SCTAB const aTab;
private:
ScDBData* GetDBData_Impl() const;
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index caafc6dfe152..3bfcb0dd593a 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -54,7 +54,7 @@ public:
const ScDefaultsOptions& GetDefaultsOptions() const { return theOptions; }
private:
- ScDefaultsOptions theOptions;
+ ScDefaultsOptions const theOptions;
};
// config item
diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx
index 6fa01fbcd104..eaf88b049049 100644
--- a/sc/inc/defltuno.hxx
+++ b/sc/inc/defltuno.hxx
@@ -37,7 +37,7 @@ class ScDocDefaultsObj : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SfxItemPropertyMap aPropertyMap;
+ SfxItemPropertyMap const aPropertyMap;
void ItemsChanged();
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx
index abe2d2a57d62..688fff0b490a 100644
--- a/sc/inc/detdata.hxx
+++ b/sc/inc/detdata.hxx
@@ -37,7 +37,7 @@ enum ScDetOpType
class ScDetOpData
{
ScAddress aPos;
- ScDetOpType eOperation;
+ ScDetOpType const eOperation;
public:
ScDetOpData( const ScAddress& rP, ScDetOpType eOp ) :
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index e0afe1ce8eb0..aa4f88e3d685 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -53,7 +53,7 @@ class SC_DLLPUBLIC ScDetectiveFunc
static bool bColorsInitialized;
ScDocument* pDoc;
- SCTAB nTab;
+ SCTAB const nTab;
enum class DrawPosMode
{
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 30d93379eae3..77541cec1511 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -61,11 +61,11 @@ class ScValueIterator // walk through all values in an area
SCCOL mnCol;
SCTAB mnTab;
SCROW nAttrEndRow;
- SubtotalFlags mnSubTotalFlags;
+ SubtotalFlags const mnSubTotalFlags;
SvNumFormatType nNumFmtType;
bool bNumValid;
- bool bCalcAsShown;
- bool bTextAsZero;
+ bool const bCalcAsShown;
+ bool const bTextAsZero;
const sc::CellStoreType* mpCells;
PositionType maCurPos;
@@ -147,12 +147,12 @@ private:
const ScAttrArray* pAttrArray;
sal_uInt32 nNumFormat; // for CalcAsShown
sal_uInt32 nNumFmtIndex;
- SCCOL nCol;
+ SCCOL const nCol;
SCROW nRow;
SCROW nAttrEndRow;
- SCTAB nTab;
+ SCTAB const nTab;
SvNumFormatType nNumFmtType;
- bool bCalcAsShown;
+ bool const bCalcAsShown;
};
class DataAccessMatrix : public DataAccess
@@ -213,7 +213,7 @@ class ScCellIterator
ScAddress maCurPos;
PositionType maCurColPos;
- SubtotalFlags mnSubTotalFlags;
+ SubtotalFlags const mnSubTotalFlags;
ScRefCellValue maCurCell;
@@ -370,9 +370,9 @@ class ScDocAttrIterator // all attribute areas
private:
ScDocument* pDoc;
SCTAB nTab;
- SCCOL nEndCol;
- SCROW nStartRow;
- SCROW nEndRow;
+ SCCOL const nEndCol;
+ SCROW const nStartRow;
+ SCROW const nEndRow;
SCCOL nCol;
std::unique_ptr<ScAttrIterator>
pColIter;
@@ -391,9 +391,9 @@ class ScAttrRectIterator // all attribute areas, including areas stre
private:
ScDocument* pDoc;
SCTAB nTab;
- SCCOL nEndCol;
- SCROW nStartRow;
- SCROW nEndRow;
+ SCCOL const nEndCol;
+ SCROW const nStartRow;
+ SCROW const nEndRow;
SCCOL nIterStartCol;
SCCOL nIterEndCol;
std::unique_ptr<ScAttrIterator>
@@ -422,10 +422,10 @@ class ScHorizontalCellIterator // walk through all non empty cells in an ar
ScDocument* pDoc;
SCTAB mnTab;
- SCCOL nStartCol;
- SCCOL nEndCol;
- SCROW nStartRow;
- SCROW nEndRow;
+ SCCOL const nStartCol;
+ SCCOL const nEndCol;
+ SCROW const nStartRow;
+ SCROW const nEndRow;
SCCOL mnCol;
SCROW mnRow;
ScRefCellValue maCurCell;
@@ -462,7 +462,7 @@ private:
SCROW nCurRow;
SCTAB nCurTab;
SCROW nAttrEndRow;
- bool bCalcAsShown;
+ bool const bCalcAsShown;
public:
@@ -480,10 +480,10 @@ class ScHorizontalAttrIterator
private:
ScDocument* pDoc;
SCTAB nTab;
- SCCOL nStartCol;
- SCROW nStartRow;
- SCCOL nEndCol;
- SCROW nEndRow;
+ SCCOL const nStartCol;
+ SCROW const nStartRow;
+ SCCOL const nEndCol;
+ SCROW const nEndRow;
std::unique_ptr<SCROW[]> pNextEnd;
std::unique_ptr<SCCOL[]> pHorizEnd;
@@ -558,7 +558,7 @@ public:
private:
::std::set<SCROW>& mrBreaks;
::std::set<SCROW>::const_iterator maItr;
- ::std::set<SCROW>::const_iterator maEnd;
+ ::std::set<SCROW>::const_iterator const maEnd;
};
class ScDocRowHeightUpdater
@@ -588,8 +588,8 @@ private:
private:
ScDocument& mrDoc;
VclPtr<OutputDevice> mpOutDev;
- double mfPPTX;
- double mfPPTY;
+ double const mfPPTX;
+ double const mfPPTY;
const ::std::vector<TabRanges>* mpTabRangesArray;
};
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 436c9975ad6d..1a488abcaf0a 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -151,7 +151,7 @@ public:
const ScDocOptions& GetDocOptions() const { return theOptions; }
private:
- ScDocOptions theOptions;
+ ScDocOptions const theOptions;
};
// Config Item containing document options
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 96b28d4d13f0..bf8790c6537d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -457,7 +457,7 @@ private:
osl::Mutex mScLookupMutex; // protection for thread-unsafe parts of handling ScLookup
std::vector<ScLookupCacheMap*> mThreadStoredScLookupCaches; // temporarily stored for computation threads
- sal_uInt16 nSrcVer; // file version (load/save)
+ static const sal_uInt16 nSrcVer; // file version (load/save)
sal_uInt16 nFormulaTrackCount;
HardRecalcState eHardRecalcState; // off, temporary, eternal
SCTAB nVisibleTab; // for OLE etc., don't use inside ScDocument
@@ -471,9 +471,9 @@ private:
// AutoCalcShellDisabled and TrackFormulas
bool bForcedFormulaPending;
bool bCalculatingFormulaTree;
- bool bIsClip;
- bool bIsUndo;
- bool bIsFunctionAccess;
+ bool const bIsClip;
+ bool const bIsUndo;
+ bool const bIsFunctionAccess;
bool bIsVisible; // set from view ctor
bool bIsEmbedded; // display/adjust Embedded area?
@@ -1957,7 +1957,7 @@ public:
SC_DLLPUBLIC void CopyStdStylesFrom( const ScDocument* pSrcDoc );
- sal_uLong GetSrcVersion() const { return nSrcVer; }
+ static sal_uInt16 GetSrcVersion() { return nSrcVer; }
void SetSrcCharSet( rtl_TextEncoding eNew ) { eSrcSet = eNew; }
void UpdateFontCharSet();
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 630caed76206..0e68afbd0058 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -91,7 +91,7 @@ class SC_DLLPUBLIC ScModelObj : public SfxBaseModel,
public css::sheet::opencl::XOpenCLSelection
{
private:
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
ScDocShell* pDocShell;
std::unique_ptr<ScPrintFuncCache> pPrintFuncCache;
std::unique_ptr<ScPrintUIOptions> pPrinterOptions;
@@ -506,9 +506,9 @@ class ScTableColumnsObj : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB nTab;
- SCCOL nStartCol;
- SCCOL nEndCol;
+ SCTAB const nTab;
+ SCCOL const nStartCol;
+ SCCOL const nEndCol;
ScTableColumnObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const;
ScTableColumnObj* GetObjectByName_Impl(const OUString& aName) const;
@@ -572,9 +572,9 @@ class ScTableRowsObj : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB nTab;
- SCROW nStartRow;
- SCROW nEndRow;
+ SCTAB const nTab;
+ SCROW const nStartRow;
+ SCROW const nEndRow;
ScTableRowObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const;
@@ -659,7 +659,7 @@ class ScAnnotationsObj : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB nTab; ///< Collection belongs to the sheet
+ SCTAB const nTab; ///< Collection belongs to the sheet
bool GetAddressByIndex_Impl( sal_Int32 nIndex, ScAddress& rPos ) const;
ScAnnotationObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const;
@@ -702,7 +702,7 @@ class ScScenariosObj : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB nTab;
+ SCTAB const nTab;
bool GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex );
ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex);
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 05d482296b7b..c88d8df716d1 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -69,7 +69,7 @@ public:
virtual std::vector<ScDPItemData> getMatchValues() const override;
private:
- ScDPItemData maItem;
+ ScDPItemData const maItem;
};
/** multi-item (group) filter. */
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 2e0517d993d6..149df70278cd 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -124,7 +124,7 @@ class ScDPGroupTableData : public ScDPTableData
ScDPGroupDimensionVec aGroups;
std::unique_ptr<ScDPNumGroupDimension[]>
pNumGroups; // array[nSourceCount]
- ScDocument* pDoc;
+ ScDocument* const pDoc;
std::unordered_set< OUString >
aGroupNames;
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 5b69aaca9f2a..eb5467d30479 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -274,7 +274,7 @@ public:
typedef std::vector<ScRange> RangeIndexType;
CachesType m_Caches;
RangeIndexType maRanges;
- ScDocument* mpDoc;
+ ScDocument* const mpDoc;
public:
SheetCaches(ScDocument* pDoc);
bool hasCache(const ScRange& rRange) const;
@@ -301,7 +301,7 @@ public:
friend class ScDPCollection;
typedef ::std::map<OUString, std::unique_ptr<ScDPCache>> CachesType;
CachesType m_Caches;
- ScDocument* mpDoc;
+ ScDocument* const mpDoc;
public:
NameCaches(ScDocument* pDoc);
bool hasCache(const OUString& rName) const;
@@ -322,9 +322,9 @@ public:
*/
struct DBType
{
- sal_Int32 mnSdbType;
- OUString maDBName;
- OUString maCommand;
+ sal_Int32 const mnSdbType;
+ OUString const maDBName;
+ OUString const maCommand;
DBType(sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand);
struct less
@@ -341,7 +341,7 @@ public:
friend class ScDPCollection;
typedef ::std::map<DBType, std::unique_ptr<ScDPCache>, DBType::less> CachesType;
CachesType m_Caches;
- ScDocument* mpDoc;
+ ScDocument* const mpDoc;
public:
DBCaches(ScDocument* pDoc);
bool hasCache(sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand) const;
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index 51fb47b0f2d0..ab4a63e2a215 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -76,7 +76,7 @@ private:
SCROW nDataStartRow;
SCCOL nTabEndCol;
SCROW nTabEndRow;
- bool bDoFilter:1;
+ bool const bDoFilter:1;
bool bResultsError:1;
bool bSizesValid:1;
bool bSizeOverflow:1;
diff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxx
index 3ffb052d7454..59ab88bc917d 100644
--- a/sc/inc/dpoutputgeometry.hxx
+++ b/sc/inc/dpoutputgeometry.hxx
@@ -55,13 +55,13 @@ private:
void adjustFieldsForDataLayout(sal_uInt32& rColumnFields, sal_uInt32& rRowFields) const;
private:
- ScRange maOutRange;
+ ScRange const maOutRange;
sal_uInt32 mnRowFields; /// number of row fields
sal_uInt32 mnColumnFields;
sal_uInt32 mnPageFields;
sal_uInt32 mnDataFields;
FieldType meDataLayoutType;
- bool mbShowFilter;
+ bool const mbShowFilter;
bool mbHeaderLayout;
bool mbCompactMode; // MSO only setting
};
diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx
index ffccaa6dddc0..7fed71374dd4 100644
--- a/sc/inc/dpresfilter.hxx
+++ b/sc/inc/dpresfilter.hxx
@@ -26,12 +26,12 @@ namespace com { namespace sun { namespace star { namespace sheet {
struct ScDPResultFilter
{
- OUString maDimName;
+ OUString const maDimName;
OUString maValueName;
OUString maValue;
bool mbHasValue:1;
- bool mbDataLayout:1;
+ bool const mbDataLayout:1;
ScDPResultFilter(const OUString& rDimName, bool bDataLayout);
};
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 990fbe8172e8..da659809280c 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -60,8 +60,8 @@ class ScDPInitState
public:
struct Member
{
- long mnSrcIndex;
- SCROW mnNameIndex;
+ long const mnSrcIndex;
+ SCROW const mnNameIndex;
Member(long nSrcIndex, SCROW nNameIndex);
};
@@ -125,8 +125,8 @@ public:
void RemoveRowIndex();
private:
- ScDPResultMember* pColResRoot;
- ScDPResultMember* pRowResRoot;
+ ScDPResultMember* const pColResRoot;
+ ScDPResultMember* const pRowResRoot;
mutable IndexArray maColVisible;
mutable IndexArray maColSorted;
@@ -137,7 +137,7 @@ private:
struct ScDPRelativePos
{
long nBasePos; // simple count, without sort order applied
- long nDirection;
+ long const nDirection;
ScDPRelativePos( long nBase, long nDir );
};
@@ -248,7 +248,7 @@ private:
const ::std::vector<ScDPDimension*>& mppDim;
const ::std::vector<ScDPLevel*>& mppLev;
- bool mbRow:1;
+ bool const mbRow:1;
bool mbInitChild:1;
bool mbAllChildren:1;
public:
@@ -331,11 +331,11 @@ class ScDPResultMember
{
private:
const ScDPResultData* pResultData;
- ScDPParentDimData aParentDimData;
+ ScDPParentDimData const aParentDimData;
std::unique_ptr<ScDPResultDimension> pChildDimension;
std::unique_ptr<ScDPDataMember> pDataRoot;
bool bHasElements:1;
- bool bForceSubTotal:1;
+ bool const bForceSubTotal:1;
bool bHasHiddenDetails:1;
bool bInitialized:1;
bool bAutoHidden:1;
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 8024eaa25738..3d5d9778da90 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -267,7 +267,7 @@ class ScDPDimension : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
ScDPSource* pSource;
- long nDim; // dimension index (== column ID)
+ long const nDim; // dimension index (== column ID)
rtl::Reference<ScDPHierarchies> mxHierarchies;
ScGeneralFunction nFunction;
OUString aName; // if empty, take from source
@@ -348,8 +348,8 @@ class ScDPHierarchies : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- ScDPSource* pSource;
- long nDim;
+ ScDPSource* const pSource;
+ long const nDim;
// date columns have 3 hierarchies (flat/quarter/week), other columns only one
// #i52547# don't offer the incomplete date hierarchy implementation
static const long nHierCount = 1;
@@ -384,9 +384,9 @@ class ScDPHierarchy : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- ScDPSource* pSource;
- long nDim;
- long nHier;
+ ScDPSource* const pSource;
+ long const nDim;
+ long const nHier;
rtl::Reference<ScDPLevels> mxLevels;
public:
@@ -415,8 +415,8 @@ class ScDPLevels : public cppu::WeakImplHelper<
{
private:
ScDPSource* pSource;
- long nDim;
- long nHier;
+ long const nDim;
+ long const nHier;
long nLevCount;
std::unique_ptr<rtl::Reference<ScDPLevel>[]>
ppLevs;
@@ -452,9 +452,9 @@ class ScDPLevel : public cppu::WeakImplHelper<
{
private:
ScDPSource* pSource;
- long nDim;
- long nHier;
- long nLev;
+ long const nDim;
+ long const nHier;
+ long const nLev;
rtl::Reference<ScDPMembers> mxMembers;
css::uno::Sequence<sal_Int16> aSubTotals;
css::sheet::DataPilotFieldSortInfo aSortInfo; // stored user settings
@@ -556,7 +556,7 @@ private:
ScDPSource* pSource;
long nDim;
long nHier;
- long nLev;
+ long const nLev;
long nMbrCount;
mutable MembersType maMembers;
mutable ScDPMembersHashMap aHashMap;
@@ -603,10 +603,10 @@ class ScDPMember : public cppu::WeakImplHelper<
private:
ScDPSource* pSource;
long nDim;
- long nHier;
- long nLev;
+ long const nHier;
+ long const nLev;
- SCROW mnDataId;
+ SCROW const mnDataId;
boost::optional<OUString> mpLayoutName;
sal_Int32 nPosition; // manual sorting
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index f7ea09fbea35..738ee08b6b37 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -35,7 +35,7 @@ class ScMarkData;
class ScTabDeletedHint : public SfxHint
{
private:
- SCTAB nTab;
+ SCTAB const nTab;
public:
ScTabDeletedHint( SCTAB nTabNo );
virtual ~ScTabDeletedHint() override;
@@ -46,7 +46,7 @@ public:
class ScTabSizeChangedHint : public SfxHint
{
private:
- SCTAB nTab;
+ SCTAB const nTab;
public:
ScTabSizeChangedHint( SCTAB nTabNo );
virtual ~ScTabSizeChangedHint() override;
@@ -60,10 +60,10 @@ public:
class ScUndoObjData : public SdrUndoObj
{
private:
- ScAddress aOldStt;
- ScAddress aOldEnd;
- ScAddress aNewStt;
- ScAddress aNewEnd;
+ ScAddress const aOldStt;
+ ScAddress const aOldEnd;
+ ScAddress const aNewStt;
+ ScAddress const aNewEnd;
public:
ScUndoObjData( SdrObject* pObj, const ScAddress& rOS, const ScAddress& rOE,
const ScAddress& rNS, const ScAddress& rNE );
@@ -78,8 +78,8 @@ class ScUndoAnchorData : public SdrUndoObj
private:
bool mbWasCellAnchored;
bool mbWasResizeWithCell;
- ScDocument* mpDoc;
- SCTAB mnTab;
+ ScDocument* const mpDoc;
+ SCTAB const mnTab;
public:
ScUndoAnchorData( SdrObject* pObj, ScDocument* pDoc, SCTAB nTab );
virtual ~ScUndoAnchorData() override;
@@ -91,7 +91,7 @@ public:
class SC_DLLPUBLIC ScDrawLayer : public FmFormModel
{
private:
- OUString aName;
+ OUString const aName;
ScDocument* pDoc;
std::unique_ptr<SdrUndoGroup> pUndoGroup;
bool bRecording;
diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx
index 0300f3f61d81..fd4ab6785d0c 100644
--- a/sc/inc/editdataarray.hxx
+++ b/sc/inc/editdataarray.hxx
@@ -50,9 +50,9 @@ public:
private:
std::unique_ptr<EditTextObject> mpOldData;
std::unique_ptr<EditTextObject> mpNewData;
- SCTAB mnTab;
- SCCOL mnCol;
- SCROW mnRow;
+ SCTAB const mnTab;
+ SCCOL const mnCol;
+ SCROW const mnRow;
};
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index a719230bb379..11af8707dc0d 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -96,7 +96,7 @@ class ScAnnotationEditSource : public SvxEditSource, public SfxListener
{
private:
ScDocShell* pDocShell;
- ScAddress aCellPos;
+ ScAddress const aCellPos;
std::unique_ptr<ScEditEngineDefaulter> pEditEngine;
std::unique_ptr<SvxEditEngineForwarder> pForwarder;
bool bDataValid;
@@ -118,7 +118,7 @@ public:
class ScSimpleEditSource : public SvxEditSource
{
private:
- SvxTextForwarder* pForwarder;
+ SvxTextForwarder* const pForwarder;
public:
ScSimpleEditSource( SvxTextForwarder* pForw );
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index a446b5cb385c..8d4a8a9fc282 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -37,14 +37,14 @@ class ScEditEngineDefaulter;
class ScEditUtil
{
ScDocument* pDoc;
- SCCOL nCol;
- SCROW nRow;
- SCTAB nTab;
- Point aScrPos;
+ SCCOL const nCol;
+ SCROW const nRow;
+ SCTAB const nTab;
+ Point const aScrPos;
VclPtr<OutputDevice> pDev; // MapMode has to be set
- double nPPTX;
- double nPPTY;
- Fraction aZoomX;
+ double const nPPTX;
+ double const nPPTY;
+ Fraction const aZoomX;
Fraction aZoomY;
public:
@@ -105,9 +105,9 @@ public:
class ScEnginePoolHelper
{
protected:
- SfxItemPool* pEnginePool;
+ SfxItemPool* const pEnginePool;
SfxItemSet* pDefaults;
- bool bDeleteEnginePool;
+ bool const bDeleteEnginePool;
bool bDeleteDefaults;
ScEnginePoolHelper( SfxItemPool* pEnginePool, bool bDeleteEnginePool );
@@ -201,7 +201,7 @@ struct ScHeaderFieldData
class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter
{
private:
- ScDocument* mpDoc;
+ ScDocument* const mpDoc;
bool bExecuteURL;
public:
diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx
index eb85fd9e6fa4..2c420f8501e5 100644
--- a/sc/inc/eventuno.hxx
+++ b/sc/inc/eventuno.hxx
@@ -36,7 +36,7 @@ class ScSheetEventsObj : public cppu::WeakImplHelper<
{
private:
ScDocShell* mpDocShell;
- SCTAB mnTab;
+ SCTAB const mnTab;
public:
ScSheetEventsObj(ScDocShell* pDocSh, SCTAB nT);
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index f889c1406d59..0dee986d81c0 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -68,9 +68,9 @@ private:
ScExternalRefLink() = delete;
ScExternalRefLink(const ScExternalRefLink&) = delete;
- sal_uInt16 mnFileId;
+ sal_uInt16 const mnFileId;
OUString maFilterName;
- ScDocument* mpDoc;
+ ScDocument* const mpDoc;
bool mbDoRefresh;
};
@@ -392,7 +392,7 @@ public:
~ApiGuard();
private:
ScExternalRefManager* mpMgr;
- bool mbOldInteractionEnabled;
+ bool const mbOldInteractionEnabled;
};
private:
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 85e641e326e5..9b6245131c85 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -60,7 +60,7 @@ class ScCellFieldsObj : public cppu::WeakImplHelper<
private:
css::uno::Reference<css::text::XTextRange> mxContent;
ScDocShell* pDocShell;
- ScAddress aCellPos;
+ ScAddress const aCellPos;
std::unique_ptr<ScEditSource> mpEditSource;
/// List of refresh listeners.
comphelper::OInterfaceContainerHelper2* mpRefreshListeners;
@@ -175,7 +175,7 @@ class ScEditFieldObj : public cppu::WeakImplHelper<
std::unique_ptr<ScEditSource> mpEditSource;
ESelection aSelection;
- sal_Int32 meType;
+ sal_Int32 const meType;
std::unique_ptr<SvxFieldData> mpData;
css::uno::Reference<css::text::XTextRange> mpContent;
diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index 6b9ff623bf6a..850fb4738ae0 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -194,7 +194,7 @@ struct ScTableInfo
std::unique_ptr<RowInfo[]>
mpRowInfo;
SCSIZE mnArrCount;
- SCSIZE mnArrCapacity;
+ SCSIZE const mnArrCapacity;
bool mbPageMode;
explicit ScTableInfo(const SCSIZE capacity = 1024);
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 267828795ecf..9d82f81c95cb 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -164,7 +164,7 @@ class ScTableValidationObj : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
ScConditionMode nMode;
OUString aExpr1;
OUString aExpr2;
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 593beb8c4bca..877655210f9e 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -36,12 +36,12 @@ struct FormulaGroupEntry
union
{
ScFormulaCell* mpCell; // non-shared formula cell
- ScFormulaCell** mpCells; // pointer to the top formula cell in a shared group.
+ ScFormulaCell** const mpCells; // pointer to the top formula cell in a shared group.
};
- size_t mnRow;
- size_t mnLength;
- bool mbShared;
+ size_t const mnRow;
+ size_t const mnLength;
+ bool const mbShared;
FormulaGroupEntry( ScFormulaCell** pCells, size_t nRow, size_t nLength );
@@ -60,8 +60,8 @@ struct FormulaGroupContext
struct ColKey
{
- SCTAB mnTab;
- SCCOL mnCol;
+ SCTAB const mnTab;
+ SCCOL const mnCol;
struct Hash
{
diff --git a/sc/inc/formulaiter.hxx b/sc/inc/formulaiter.hxx
index 5a0775a8b056..aa92e78c7b65 100644
--- a/sc/inc/formulaiter.hxx
+++ b/sc/inc/formulaiter.hxx
@@ -33,7 +33,7 @@ class ScDetectiveRefIter
{
private:
formula::FormulaTokenArrayPlainIterator maIter;
- ScAddress aPos;
+ ScAddress const aPos;
public:
ScDetectiveRefIter( ScFormulaCell* pCell );
bool GetNextRef( ScRange& rRange );
diff --git a/sc/inc/formulalogger.hxx b/sc/inc/formulalogger.hxx
index 879418eab0b4..7d1dc59efdd6 100644
--- a/sc/inc/formulalogger.hxx
+++ b/sc/inc/formulalogger.hxx
@@ -39,7 +39,7 @@ namespace sc {
class FormulaLogger
{
std::unique_ptr<osl::File> mpLogFile;
- std::vector<OUString> maMessages;
+ std::vector<OUString> const maMessages;
sal_Int32 mnNestLevel = 0;
const ScFormulaCellGroup* mpLastGroup = nullptr;
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 741eb4e98cb6..202f50c3e1d2 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -92,7 +92,7 @@ public:
const ScFormulaOptions& GetFormulaOptions() const { return theOptions; }
private:
- ScFormulaOptions theOptions;
+ ScFormulaOptions const theOptions;
};
// config item
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index eac70db65831..fea35eb49a31 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -35,7 +35,7 @@ struct FormulaResultValue
{
enum Type { Invalid, Value, String, Error };
- Type meType;
+ Type const meType;
double mfValue;
svl::SharedString maString;
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index 65ce16a7cf2e..c03917d76d0d 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -289,7 +289,7 @@ public:
private:
::std::vector<const ScFuncDesc*>* m_pCategory; /**< list of functions in this category */
mutable OUString m_sName; /**< name of this category */
- sal_uInt32 m_nCategory; /**< index number of this category */
+ sal_uInt32 const m_nCategory; /**< index number of this category */
};
#define SC_FUNCGROUP_COUNT ID_FUNCTION_GRP_ADDINS
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 08a60c42467a..5efbbffd5878 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -61,7 +61,7 @@ class ScFunctionAccess : public cppu::WeakImplHelper<
private:
ScTempDocCache aDocCache;
std::unique_ptr<ScDocOptions> pOptions;
- SfxItemPropertyMap aPropertyMap;
+ SfxItemPropertyMap const aPropertyMap;
bool mbArray;
bool mbValid;
diff --git a/sc/inc/grouparealistener.hxx b/sc/inc/grouparealistener.hxx
index 04aa7c7582a2..283bc3124637 100644
--- a/sc/inc/grouparealistener.hxx
+++ b/sc/inc/grouparealistener.hxx
@@ -30,8 +30,8 @@ class FormulaGroupAreaListener : public SvtListener
const ScColumn* mpColumn;
SCROW mnTopCellRow;
SCROW mnGroupLen;
- bool mbStartFixed;
- bool mbEndFixed;
+ bool const mbStartFixed;
+ bool const mbEndFixed;
public:
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index f2b45cecdce3..55fc22c450b7 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -27,8 +27,8 @@
class SC_DLLPUBLIC ScPaintHint : public SfxHint
{
- ScRange aRange;
- PaintPartFlags nParts;
+ ScRange const aRange;
+ PaintPartFlags const nParts;
bool bPrint; // flag indicating whether print/preview if affected
public:
@@ -49,11 +49,11 @@ public:
class ScUpdateRefHint : public SfxHint
{
- UpdateRefMode eUpdateRefMode;
- ScRange aRange;
- SCCOL nDx;
- SCROW nDy;
- SCTAB nDz;
+ UpdateRefMode const eUpdateRefMode;
+ ScRange const aRange;
+ SCCOL const nDx;
+ SCROW const nDy;
+ SCTAB const nDz;
public:
ScUpdateRefHint( UpdateRefMode eMode, const ScRange& rR,
@@ -102,10 +102,10 @@ public:
class ScAutoStyleHint : public SfxHint
{
- ScRange aRange;
- OUString aStyle1;
- OUString aStyle2;
- sal_uLong nTimeout;
+ ScRange const aRange;
+ OUString const aStyle1;
+ OUString const aStyle2;
+ sal_uLong const nTimeout;
public:
ScAutoStyleHint( const ScRange& rR, const OUString& rSt1,
@@ -120,7 +120,7 @@ public:
class ScDBRangeRefreshedHint : public SfxHint
{
- ScImportParam aParam;
+ ScImportParam const aParam;
public:
ScDBRangeRefreshedHint( const ScImportParam& rP );
@@ -131,7 +131,7 @@ public:
class ScDataPilotModifiedHint : public SfxHint
{
- OUString maName;
+ OUString const maName;
public:
ScDataPilotModifiedHint( const OUString& rName );
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 1570039607f9..38319c46b644 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -56,7 +56,7 @@ class ScSheetLinkObj : public cppu::WeakImplHelper<
public SfxListener
{
private:
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
ScDocShell* pDocShell;
OUString aFileName;
XRefreshListenerArr_Impl aRefreshListeners;
@@ -162,9 +162,9 @@ class ScAreaLinkObj : public cppu::WeakImplHelper<
public SfxListener
{
private:
- SfxItemPropertySet aPropSet;
- ScDocShell* pDocShell;
- size_t nPos;
+ SfxItemPropertySet const aPropSet;
+ ScDocShell* pDocShell;
+ size_t const nPos;
XRefreshListenerArr_Impl aRefreshListeners;
void Modify_Impl( const OUString* pNewFile, const OUString* pNewFilter,
@@ -275,10 +275,10 @@ class ScDDELinkObj : public cppu::WeakImplHelper<
public SfxListener
{
private:
- ScDocShell* pDocShell;
- OUString aAppl;
- OUString aTopic;
- OUString aItem;
+ ScDocShell* pDocShell;
+ OUString const aAppl;
+ OUString const aTopic;
+ OUString const aItem;
XRefreshListenerArr_Impl aRefreshListeners;
void Refreshed_Impl();
@@ -388,7 +388,7 @@ private:
private:
ScDocShell* mpDocShell;
ScExternalRefCache::TableTypeRef mpTable;
- size_t mnIndex;
+ size_t const mnIndex;
};
class ScExternalDocLinkObj : public cppu::WeakImplHelper< css::sheet::XExternalDocLink >
@@ -422,9 +422,9 @@ public:
virtual sal_Int32 SAL_CALL getTokenIndex() override;
private:
- ScDocShell* mpDocShell;
+ ScDocShell* const mpDocShell;
ScExternalRefManager* mpRefMgr;
- sal_uInt16 mnFileId;
+ sal_uInt16 const mnFileId;
};
/** This is the UNO API equivalent of ScExternalRefManager. */
@@ -459,7 +459,7 @@ private:
ScExternalDocLinksObj(const ScExternalDocLinksObj&) = delete;
private:
- ScDocShell* mpDocShell;
+ ScDocShell* const mpDocShell;
ScExternalRefManager* mpRefMgr;
};
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index ad413490b65d..26dd0eae949d 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -46,7 +46,7 @@ class EndListeningContext
ScDocument& mrDoc;
ColumnSpanSet maSet;
std::shared_ptr<ColumnBlockPositionSet> mpPosSet;
- ScTokenArray* mpOldCode;
+ ScTokenArray* const mpOldCode;
ScAddress maPosDelta; // Add this to get the old position prior to the move.
public:
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 15ec15f086b1..cca7a52ad38c 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -142,9 +142,9 @@ private:
struct QueryKey
{
- SCROW mnRow;
- SCTAB mnTab;
- QueryOp meOp;
+ SCROW const mnRow;
+ SCTAB const mnTab;
+ QueryOp const meOp;
QueryKey( const ScAddress & rAddress, const QueryOp eOp ) :
mnRow( rAddress.Row()),
@@ -171,7 +171,7 @@ private:
struct QueryCriteriaAndResult
{
- QueryCriteria maCriteria;
+ QueryCriteria const maCriteria;
ScAddress maAddress;
QueryCriteriaAndResult( const QueryCriteria & rCriteria, const ScAddress & rAddress ) :
@@ -182,7 +182,7 @@ private:
};
std::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash > maQueryMap;
- ScRange maRange;
+ ScRange const maRange;
ScDocument * mpDoc;
ScLookupCache( const ScLookupCache & ) = delete;
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index 566ca6d1cae2..e0391e431f43 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -78,7 +78,7 @@ class ScIndexEnumeration : public cppu::WeakImplHelper<
{
private:
css::uno::Reference<css::container::XIndexAccess> xIndex;
- OUString sServiceName;
+ OUString const sServiceName;
sal_Int32 nPos;
public:
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 448db7c8af7f..15f7a5157856 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -253,7 +253,7 @@ class ScLabelRangeObj : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- bool bColumn;
+ bool const bColumn;
ScRange aRange; ///< criterion to find range
private:
@@ -286,7 +286,7 @@ class ScLabelRangesObj : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- bool bColumn;
+ bool const bColumn;
ScLabelRangeObj* GetObjectByIndex_Impl(size_t nIndex);
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index 015132a7b4fa..59af4726022a 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -98,7 +98,7 @@ private:
private:
ScDocShell* pDocShell;
- ScAddress aCellPos;
+ ScAddress const aCellPos;
rtl::Reference<SvxUnoText> pUnoText;
};
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index 5b9e830aadc0..2b8f94425f73 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -30,7 +30,7 @@ struct ScOrcusXMLTreeParam
struct EntryData
{
size_t mnNamespaceID; /// numerical ID for xml namespace
- EntryType meType;
+ EntryType const meType;
ScAddress maLinkedPos; /// linked cell position (invalid if unlinked)
bool mbRangeParent:1;
bool mbLeafNode:1; /// Leaf if it has no child elements. Child Attributes don't count.
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index fcb4ea542354..ca72c47befca 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -259,7 +259,7 @@ namespace sc {
struct NoteEntry
{
- ScAddress maPos;
+ ScAddress const maPos;
const ScPostIt* mpNote;
NoteEntry( const ScAddress& rPos, const ScPostIt* pNote );
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index de53c502c74c..52379bb3f05f 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -65,7 +65,7 @@ public:
const ScPrintOptions& GetPrintOptions() const { return theOptions; }
private:
- ScPrintOptions theOptions;
+ ScPrintOptions const theOptions;
};
// config item
diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx
index ca928f908dd1..e1e81991e111 100644
--- a/sc/inc/prnsave.hxx
+++ b/sc/inc/prnsave.hxx
@@ -50,7 +50,7 @@ public:
class ScPrintRangeSaver
{
- SCTAB nTabCount;
+ SCTAB const nTabCount;
std::unique_ptr<ScPrintSaverTab[]> pData;
public:
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 79215637ef03..594b21d56057 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -182,7 +182,7 @@ protected:
ScDBQueryParamBase(DataType eType);
private:
- DataType meType;
+ DataType const meType;
};
struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTable
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index ae3cefa810c2..728164a54d6d 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -67,8 +67,8 @@ public:
};
private:
- OUString aName;
- OUString aUpperName; // #i62977# for faster searching (aName is never modified after ctor)
+ OUString const aName;
+ OUString const aUpperName; // #i62977# for faster searching (aName is never modified after ctor)
OUString maNewName; ///< used for formulas after changing names in the dialog
std::unique_ptr<ScTokenArray>
pCode;
@@ -81,8 +81,8 @@ private:
// max row and column to use for wrapping of references. If -1 use the
// application's default.
- SCROW mnMaxRow;
- SCCOL mnMaxCol;
+ SCROW const mnMaxRow;
+ SCCOL const mnMaxCol;
void CompileRangeData( const OUString& rSymbol, bool bSetError );
void InitCode();
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 03ed1db176ed..23422d7c2a71 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -30,8 +30,8 @@ class ScFormulaCell;
struct ScFormulaRecursionEntry
{
- ScFormulaCell* pCell;
- bool bOldRunning;
+ ScFormulaCell* const pCell;
+ bool const bOldRunning;
ScFormulaResult aPreviousResult;
ScFormulaRecursionEntry(
ScFormulaCell* p, bool bR, const ScFormulaResult & rRes ) :
diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx
index 9cb3bd00b924..d5e21f5e86f3 100644
--- a/sc/inc/reffind.hxx
+++ b/sc/inc/reffind.hxx
@@ -27,9 +27,9 @@ class ScDocument;
class ScRefFinder
{
OUString maFormula;
- formula::FormulaGrammar::AddressConvention meConv;
- ScDocument* mpDoc;
- ScAddress maPos;
+ formula::FormulaGrammar::AddressConvention const meConv;
+ ScDocument* const mpDoc;
+ ScAddress const maPos;
sal_Int32 mnFound;
sal_Int32 mnSelStart;
sal_Int32 mnSelEnd;
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index cfdcaa6ec40e..2e32519011a7 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -30,7 +30,7 @@ public:
};
private:
- Type meType;
+ Type const meType;
protected:
RefHint( Type eType );
@@ -49,8 +49,8 @@ public:
class RefMovedHint : public RefHint
{
- ScRange maRange;
- ScAddress maMoveDelta;
+ ScRange const maRange;
+ ScAddress const maMoveDelta;
const sc::RefUpdateContext& mrCxt;
public:
@@ -74,9 +74,9 @@ public:
class RefColReorderHint : public RefHint
{
const sc::ColRowReorderMapType& mrColMap;
- SCTAB mnTab;
- SCROW mnRow1;
- SCROW mnRow2;
+ SCTAB const mnTab;
+ SCROW const mnRow1;
+ SCROW const mnRow2;
public:
RefColReorderHint( const sc::ColRowReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 );
@@ -97,9 +97,9 @@ public:
class RefRowReorderHint : public RefHint
{
const sc::ColRowReorderMapType& mrRowMap;
- SCTAB mnTab;
- SCCOL mnCol1;
- SCCOL mnCol2;
+ SCTAB const mnTab;
+ SCCOL const mnCol1;
+ SCCOL const mnCol2;
public:
RefRowReorderHint( const sc::ColRowReorderMapType& rRowMap, SCTAB nTab, SCCOL nCol1, SCCOL nCol2 );
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index 417aa794a54e..7b5afe926e1a 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -109,8 +109,8 @@ struct RefUpdateResult
struct SC_DLLPUBLIC RefUpdateInsertTabContext
{
ScDocument& mrDoc;
- SCTAB mnInsertPos;
- SCTAB mnSheets;
+ SCTAB const mnInsertPos;
+ SCTAB const mnSheets;
UpdatedRangeNames maUpdatedNames;
RefUpdateInsertTabContext(ScDocument& rDoc, SCTAB nInsertPos, SCTAB nSheets);
@@ -119,8 +119,8 @@ struct SC_DLLPUBLIC RefUpdateInsertTabContext
struct SC_DLLPUBLIC RefUpdateDeleteTabContext
{
ScDocument& mrDoc;
- SCTAB mnDeletePos;
- SCTAB mnSheets;
+ SCTAB const mnDeletePos;
+ SCTAB const mnSheets;
UpdatedRangeNames maUpdatedNames;
RefUpdateDeleteTabContext(ScDocument& rDoc, SCTAB nInsertPos, SCTAB nSheets);
@@ -129,8 +129,8 @@ struct SC_DLLPUBLIC RefUpdateDeleteTabContext
struct RefUpdateMoveTabContext
{
ScDocument& mrDoc;
- SCTAB mnOldPos;
- SCTAB mnNewPos;
+ SCTAB const mnOldPos;
+ SCTAB const mnNewPos;
UpdatedRangeNames maUpdatedNames;
RefUpdateMoveTabContext(ScDocument& rDoc, SCTAB nOldPos, SCTAB nNewPos);
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index 78bee982744e..2bec0e05cbcb 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -24,10 +24,10 @@ class SC_DLLPUBLIC RowHeightContext
{
ScFlatUInt16RowSegments maHeights;
- double mfPPTX;
- double mfPPTY;
- Fraction maZoomX;
- Fraction maZoomY;
+ double const mfPPTX;
+ double const mfPPTY;
+ Fraction const maZoomX;
+ Fraction const maZoomY;
VclPtr<OutputDevice> mpOutDev;
sal_uInt16 mnExtraHeight;
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index c246fa9171b8..f49c077dd588 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -24,7 +24,7 @@ namespace sc {
class SC_DLLPUBLIC AutoCalcSwitch
{
ScDocument& mrDoc;
- bool mbOldValue;
+ bool const mbOldValue;
public:
AutoCalcSwitch(ScDocument& rDoc, bool bAutoCalc);
~AutoCalcSwitch();
@@ -33,7 +33,7 @@ public:
class SC_DLLPUBLIC ExpandRefsSwitch
{
ScDocument& mrDoc;
- bool mbOldValue;
+ bool const mbOldValue;
public:
ExpandRefsSwitch(ScDocument& rDoc, bool bExpandRefs);
~ExpandRefsSwitch();
@@ -42,7 +42,7 @@ public:
class SC_DLLPUBLIC UndoSwitch
{
ScDocument& mrDoc;
- bool mbOldValue;
+ bool const mbOldValue;
public:
UndoSwitch(ScDocument& rDoc, bool bUndo);
~UndoSwitch();
@@ -51,7 +51,7 @@ public:
class SC_DLLPUBLIC IdleSwitch
{
ScDocument& mrDoc;
- bool mbOldValue;
+ bool const mbOldValue;
public:
IdleSwitch(ScDocument& rDoc, bool bEnableIdle);
~IdleSwitch();
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
index 19962852a092..1f3ce0793058 100644
--- a/sc/inc/sheetdata.hxx
+++ b/sc/inc/sheetdata.hxx
@@ -49,7 +49,7 @@ struct ScStreamEntry
struct ScCellStyleEntry
{
OUString maName;
- ScAddress maCellPos;
+ ScAddress const maCellPos;
ScCellStyleEntry( const OUString& rName, const ScAddress& rPos ) :
maName(rName),
@@ -74,9 +74,9 @@ struct ScNoteStyleEntry
struct ScTextStyleEntry
{
- OUString maName;
- ScAddress maCellPos;
- ESelection maSelection;
+ OUString const maName;
+ ScAddress const maCellPos;
+ ESelection const maSelection;
ScTextStyleEntry( const OUString& rName, const ScAddress& rPos, const ESelection& rSel ) :
maName(rName),
@@ -88,9 +88,9 @@ struct ScTextStyleEntry
struct ScLoadedNamespaceEntry
{
- OUString maPrefix;
- OUString maName;
- sal_uInt16 mnKey;
+ OUString const maPrefix;
+ OUString const maName;
+ sal_uInt16 const mnKey;
ScLoadedNamespaceEntry( const OUString& rPrefix, const OUString& rName, sal_uInt16 nKey ) :
maPrefix(rPrefix),
diff --git a/sc/inc/simpleformulacalc.hxx b/sc/inc/simpleformulacalc.hxx
index f14408aa190f..e7f61b5ddbe1 100644
--- a/sc/inc/simpleformulacalc.hxx
+++ b/sc/inc/simpleformulacalc.hxx
@@ -26,14 +26,14 @@ private:
bool mbCalculated;
std::unique_ptr<ScTokenArray> mpCode;
- ScAddress maAddr;
+ ScAddress const maAddr;
ScDocument* mpDoc;
ScFormulaResult maResult;
- formula::FormulaGrammar::Grammar maGram;
+ formula::FormulaGrammar::Grammar const maGram;
bool mbMatrixResult;
OUString maMatrixFormulaResult;
bool mbLimitString;
- bool mbMatrixFormula;
+ bool const mbMatrixFormula;
public:
ScSimpleFormulaCalculator(ScDocument* pDoc, const ScAddress& rAddr,
diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx
index bd098fbfc085..d2c94846209c 100644
--- a/sc/inc/srchuno.hxx
+++ b/sc/inc/srchuno.hxx
@@ -35,7 +35,7 @@ class ScCellSearchObj : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
std::unique_ptr<SvxSearchItem>
pSearchItem;
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 4d076df46d51..34fa814451db 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -107,7 +107,7 @@ class ScStyleFamilyObj : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SfxStyleFamily eFamily; // Family
+ SfxStyleFamily const eFamily; // Family
ScStyleObj* GetObjectByIndex_Impl(sal_uInt32 nIndex);
ScStyleObj* GetObjectByName_Impl(const OUString& Name);
@@ -168,7 +168,7 @@ class ScStyleObj : public ::cppu::WeakImplHelper<
private:
const SfxItemPropertySet* pPropSet;
ScDocShell* pDocShell;
- SfxStyleFamily eFamily; // Family
+ SfxStyleFamily const eFamily; // Family
OUString aStyleName;
SfxStyleSheetBase* pStyle_cached;
diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index ee0f16ea95e1..7858fcae6f2b 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -32,7 +32,7 @@ public:
struct ScFunctionData // to calculate single functions
{
- ScSubTotalFunc eFunc;
+ ScSubTotalFunc const eFunc;
double nVal;
long nCount;
bool bError;
diff --git a/sc/inc/tabbgcolor.hxx b/sc/inc/tabbgcolor.hxx
index 872d81285201..92aff763d481 100644
--- a/sc/inc/tabbgcolor.hxx
+++ b/sc/inc/tabbgcolor.hxx
@@ -27,7 +27,7 @@
struct ScUndoTabColorInfo
{
- SCTAB mnTabId;
+ SCTAB const mnTabId;
Color maOldTabBgColor;
Color maNewTabBgColor;
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index 387a76160364..efed914a5a42 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -81,7 +81,7 @@ class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- sal_uInt16 nType;
+ sal_uInt16 const nType;
OUString aName;
public:
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index c76e67ed140e..5467c4eb6726 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -104,7 +104,7 @@ class ScHeaderFooterTextData
private:
std::unique_ptr<EditTextObject> mpTextObj;
css::uno::WeakReference<css::sheet::XHeaderFooterContent> xContentObj;
- ScHeaderFooterPart nPart;
+ ScHeaderFooterPart const nPart;
std::unique_ptr<ScEditEngineDefaulter> pEditEngine;
std::unique_ptr<SvxEditEngineForwarder> pForwarder;
bool bDataValid;
@@ -336,7 +336,7 @@ class ScCellTextData : public SfxListener
{
protected:
ScDocShell* pDocShell;
- ScAddress aCellPos;
+ ScAddress const aCellPos;
std::unique_ptr<ScFieldEditEngine> pEditEngine;
std::unique_ptr<SvxEditEngineForwarder> pForwarder;
std::unique_ptr<ScCellEditSource> pOriginalSource;
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 95fb24e5e2b5..c55230223b1f 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -97,7 +97,7 @@ public:
class ScMatrixToken : public formula::FormulaToken
{
private:
- ScMatrixRef pMatrix;
+ ScMatrixRef const pMatrix;
public:
ScMatrixToken( const ScMatrixRef& p );
ScMatrixToken( const ScMatrixToken& );
@@ -115,7 +115,7 @@ public:
*/
class ScMatrixRangeToken : public formula::FormulaToken
{
- ScMatrixRef mpMatrix;
+ ScMatrixRef const mpMatrix;
ScComplexRefData maRef;
public:
ScMatrixRangeToken( const sc::RangeMatrix& rMat );
@@ -132,8 +132,8 @@ public:
class ScExternalSingleRefToken : public formula::FormulaToken
{
- sal_uInt16 mnFileId;
- svl::SharedString maTabName;
+ sal_uInt16 const mnFileId;
+ svl::SharedString const maTabName;
ScSingleRefData maSingleRef;
public:
@@ -156,8 +156,8 @@ public:
class ScExternalDoubleRefToken : public formula::FormulaToken
{
- sal_uInt16 mnFileId;
- svl::SharedString maTabName; // name of the first sheet
+ sal_uInt16 const mnFileId;
+ svl::SharedString const maTabName; // name of the first sheet
ScComplexRefData maDoubleRef;
public:
@@ -184,8 +184,8 @@ public:
class ScExternalNameToken : public formula::FormulaToken
{
- sal_uInt16 mnFileId;
- svl::SharedString maName;
+ sal_uInt16 const mnFileId;
+ svl::SharedString const maName;
public:
ScExternalNameToken() = delete;
@@ -264,7 +264,7 @@ class ScRefListToken : public formula::FormulaToken
{
private:
ScRefList aRefList;
- bool mbArrayResult; // whether RefList is an array result
+ bool const mbArrayResult; // whether RefList is an array result
public:
ScRefListToken() :
FormulaToken( formula::svRefList ), mbArrayResult(false) {}
@@ -279,8 +279,8 @@ public:
class SC_DLLPUBLIC ScEmptyCellToken : public formula::FormulaToken
{
- bool bInherited :1;
- bool bDisplayedAsString :1;
+ bool const bInherited :1;
+ bool const bDisplayedAsString :1;
public:
explicit ScEmptyCellToken( bool bInheritedP, bool bDisplayAsString ) :
FormulaToken( formula::svEmptyCell ),
@@ -382,10 +382,10 @@ private:
class SC_DLLPUBLIC ScHybridCellToken : public formula::FormulaToken
{
private:
- double mfDouble;
- svl::SharedString maString;
- OUString maFormula;
- bool mbEmptyDisplayedAsString;
+ double const mfDouble;
+ svl::SharedString const maString;
+ OUString const maFormula;
+ bool const mbEmptyDisplayedAsString;
public:
ScHybridCellToken(
double f, const svl::SharedString & rStr, const OUString & rFormula, bool bEmptyDisplayedAsString );
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index c33f6daf6b97..69cbdfb1502f 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -30,7 +30,7 @@ struct SC_DLLPUBLIC TokenStringContext
typedef std::unordered_map<size_t, std::vector<OUString> > IndexNamesMapType;
typedef std::unordered_map<SCTAB, IndexNameMapType> TabIndexMapType;
- formula::FormulaGrammar::Grammar meGram;
+ formula::FormulaGrammar::Grammar const meGram;
formula::FormulaCompiler::OpCodeMapPtr mxOpCodeMap;
const ScCompiler::Convention* mpRefConv;
OUString maErrRef;
@@ -48,7 +48,7 @@ struct SC_DLLPUBLIC TokenStringContext
class SC_DLLPUBLIC CompileFormulaContext
{
- ScDocument* mpDoc;
+ ScDocument* const mpDoc;
formula::FormulaGrammar::Grammar meGram;
std::vector<OUString> maTabNames;
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index 56414f10c267..5b82478c3385 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -64,8 +64,8 @@ private:
class FindTypedStrData
{
- ScTypedStrData maVal;
- bool mbCaseSens;
+ ScTypedStrData const maVal;
+ bool const mbCaseSens;
public:
FindTypedStrData(const ScTypedStrData& rVal, bool bCaseSens);
bool operator() (const ScTypedStrData& r) const;
diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx
index 2ad874c2ab96..2ab996369aa1 100644
--- a/sc/inc/undorangename.hxx
+++ b/sc/inc/undorangename.hxx
@@ -59,7 +59,7 @@ public:
private:
std::unique_ptr<ScRangeData> mpRangeData;
- SCTAB mnTab;
+ SCTAB const mnTab;
};
#endif
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx
index 11cdad201a18..01a6a3437846 100644
--- a/sc/inc/unitconv.hxx
+++ b/sc/inc/unitconv.hxx
@@ -24,8 +24,8 @@
class ScUnitConverterData
{
- OUString maIndexString;
- double mfValue;
+ OUString const maIndexString;
+ double const mfValue;
public:
ScUnitConverterData( const OUString& rFromUnit,
diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx
index c5192d7308fc..863a04e224d7 100644
--- a/sc/inc/unoreflist.hxx
+++ b/sc/inc/unoreflist.hxx
@@ -26,8 +26,8 @@
struct ScUnoRefEntry
{
- sal_Int64 nObjectId;
- ScRangeList aRanges;
+ sal_Int64 const nObjectId;
+ ScRangeList const aRanges;
ScUnoRefEntry( sal_Int64 nId, const ScRangeList& rOldRanges ) :
nObjectId( nId ),
@@ -59,7 +59,7 @@ public:
class ScUnoRefUndoHint : public SfxHint
{
- ScUnoRefEntry aEntry;
+ ScUnoRefEntry const aEntry;
public:
ScUnoRefUndoHint( const ScUnoRefEntry& rRefEntry );
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 64e0d2520feb..a37df6a00127 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -63,7 +63,7 @@ class SC_DLLPUBLIC ScValidationData : public ScConditionEntry
private:
sal_uInt32 nKey; // index in attributes
- ScValidationMode eDataMode;
+ ScValidationMode const eDataMode;
bool bShowInput;
bool bShowError;
ScValidErrorStyle eErrorStyle;
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 463de1c698fe..a0660acdf4b2 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -127,7 +127,7 @@ public:
const ScViewOptions& GetViewOptions() const { return theOptions; }
private:
- ScViewOptions theOptions;
+ ScViewOptions const theOptions;
};
// CfgItem for View options
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index f9328fb87d95..1846ca6cb844 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -60,7 +60,7 @@ class ScViewPaneBase : public css::sheet::XViewPane,
{
private:
ScTabViewShell* pViewShell;
- sal_uInt16 nPane; // ScSplitPos or SC_VIEWPANE_ACTIVE
+ sal_uInt16 const nPane; // ScSplitPos or SC_VIEWPANE_ACTIVE
protected:
css::awt::Rectangle GetVisArea() const;
@@ -146,7 +146,7 @@ private:
typedef std::vector<css::uno::Reference<css::awt::XEnhancedMouseClickHandler> > XMouseClickHandlerVector;
typedef std::vector<css::uno::Reference<css::sheet::XActivationEventListener> > XActivationEventListenerVector;
- SfxItemPropertySet aPropSet;
+ SfxItemPropertySet const aPropSet;
XSelectionChangeListenerVector aSelectionChgListeners;
XRangeSelectionListenerVector aRangeSelListeners;
XRangeSelectionChangeListenerVector aRangeChgListeners;
diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx
index 8f0e8a8c2be3..1f7c3ac2e3b8 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -166,11 +166,11 @@ public:
}
private:
- ScDocument* mpDoc;
+ ScDocument* const mpDoc;
SCCOL mnCol;
SCROW mnRow;
- SCTAB mnTab;
- StringType meStringType;
+ SCTAB const mnTab;
+ StringType const meStringType;
};
class conditional_format_handler
@@ -211,10 +211,10 @@ public:
}
private:
- ScDocument* mpDoc;
+ ScDocument* const mpDoc;
SCCOL mnCol;
SCROW mnRow;
- SCTAB mnTab;
+ SCTAB const mnTab;
};
#endif
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index bc9f3db5d891..aac73cf8238a 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -82,18 +82,18 @@ struct TestParam
{
struct RowData
{
- SCROW nStartRow;
- SCROW nEndRow;
- SCTAB nTab;
- int nExpectedHeight; // -1 for default height
- int nCheck; // currently only CHECK_OPTIMAL ( we could add CHECK_MANUAL etc.)
- bool bOptimal;
+ SCROW const nStartRow;
+ SCROW const nEndRow;
+ SCTAB const nTab;
+ int const nExpectedHeight; // -1 for default height
+ int const nCheck; // currently only CHECK_OPTIMAL ( we could add CHECK_MANUAL etc.)
+ bool const bOptimal;
};
const char* sTestDoc;
- int nImportType;
- int nExportType; // -1 for import test, otherwise this is an export test
- int nRowData;
- RowData* pData;
+ int const nImportType;
+ int const nExportType; // -1 for import test, otherwise this is an export test
+ int const nRowData;
+ RowData* const pData;
};
struct FileFormat {
@@ -174,7 +174,7 @@ class SCQAHELPER_DLLPUBLIC ScBootstrapFixture : public test::BootstrapFixture
{
static const FileFormat aFileFormats[];
protected:
- OUString m_aBaseString;
+ OUString const m_aBaseString;
ScDocShellRef load(
bool bReadWrite, const OUString& rURL, const OUString& rFilter, const OUString &rUserData,
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ee1c7da229cd..4a87267be6e7 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -507,8 +507,8 @@ void Test::testRowForHeight()
struct Check
{
- sal_uLong nHeight;
- SCROW nRow;
+ sal_uLong const nHeight;
+ SCROW const nRow;
};
std::vector<Check> aChecks = {
@@ -606,8 +606,8 @@ void Test::testSelectionFunction()
struct Check
{
- ScSubTotalFunc meFunc;
- double mfExpected;
+ ScSubTotalFunc const meFunc;
+ double const mfExpected;
};
{
@@ -3610,8 +3610,8 @@ void Test::testCopyPasteSkipEmpty()
struct Check
{
const char* mpStr;
- Color maColor;
- bool mbHasNote;
+ Color const maColor;
+ bool const mbHasNote;
};
struct TestRange
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 40f1d8be1953..a59483e0789c 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -25,7 +25,7 @@ class ScUndoCut;
class FormulaGrammarSwitch
{
ScDocument* mpDoc;
- formula::FormulaGrammar::Grammar meOldGrammar;
+ formula::FormulaGrammar::Grammar const meOldGrammar;
public:
FormulaGrammarSwitch(ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar);
~FormulaGrammarSwitch();
diff --git a/sc/qa/unit/ucalc_column.cxx b/sc/qa/unit/ucalc_column.cxx
index dcf188b11c25..a650b628b20f 100644
--- a/sc/qa/unit/ucalc_column.cxx
+++ b/sc/qa/unit/ucalc_column.cxx
@@ -102,11 +102,11 @@ void Test::testSetFormula()
struct aInputs
{
const char* aName;
- SCROW nRow;
- SCCOL nCol;
+ SCROW const nRow;
+ SCCOL const nCol;
const char* aFormula1; // Represents the formula that is input to SetFormula function.
const char* aFormula2; // Represents the formula that is actually stored in the cell.
- formula::FormulaGrammar::Grammar eGram;
+ formula::FormulaGrammar::Grammar const eGram;
} aTest[] = {
{ "Rock and Roll" ,5 , 4 , "=SUM($D$2:$F$3)" ,"=SUM($D$2:$F$3)" , formula::FormulaGrammar::Grammar::GRAM_ENGLISH },
diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
index 5adf22ec57ae..c3b5694f30a9 100644
--- a/sc/qa/unit/ucalc_condformat.cxx
+++ b/sc/qa/unit/ucalc_condformat.cxx
@@ -586,8 +586,8 @@ namespace {
struct ScDataBarLengthData
{
- double nVal;
- double nLength;
+ double const nVal;
+ double const nLength;
};
void testDataBarLengthImpl(ScDocument* pDoc, ScDataBarLengthData* pData, const ScRange& rRange,
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 7c5004ca7660..0b1c4a03bd9a 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -102,7 +102,7 @@ void Test::testFormulaCreateStringFromTokens()
// Insert named ranges.
struct {
- bool bGlobal;
+ bool const bGlobal;
const char* pName;
const char* pExpr;
} aNames[] = {
@@ -139,11 +139,11 @@ void Test::testFormulaCreateStringFromTokens()
// Insert DB ranges.
struct {
const char* pName;
- SCTAB nTab;
- SCCOL nCol1;
- SCROW nRow1;
- SCCOL nCol2;
- SCROW nRow2;
+ SCTAB const nTab;
+ SCCOL const nCol1;
+ SCROW const nRow1;
+ SCCOL const nCol2;
+ SCROW const nRow2;
} aDBs[] = {
{ "Table1", 0, 0, 0, 10, 10 },
{ "Table2", 1, 0, 0, 10, 10 },
@@ -864,7 +864,7 @@ void Test::testFormulaHashAndTag()
struct {
const char* pFormula;
- ScFormulaVectorState eState;
+ ScFormulaVectorState const eState;
} aVectorTests[] = {
{ "=SUM(1;2;3;4;5)", FormulaVectorEnabled },
{ "=NOW()", FormulaVectorDisabled },
@@ -898,7 +898,7 @@ void Test::testFormulaTokenEquality()
{
const char* mpFormula1;
const char* mpFormula2;
- bool mbEqual;
+ bool const mbEqual;
};
FormulaTokenEqualityTest aTests[] = {
@@ -1015,8 +1015,8 @@ void Test::testFormulaCompilerJumpReordering()
{
struct TokenCheck
{
- OpCode meOp;
- StackVar meType;
+ OpCode const meOp;
+ StackVar const meType;
};
// Set separators first.
@@ -1091,11 +1091,11 @@ void Test::testFormulaCompilerImplicitIntersection2Param()
{
struct TestCaseFormula
{
- OUString aFormula;
- ScAddress aCellAddress;
- ScRange aSumRange;
- bool bStartColRel; // SumRange-StartCol
- bool bEndColRel; // SumRange-EndCol
+ OUString const aFormula;
+ ScAddress const aCellAddress;
+ ScRange const aSumRange;
+ bool const bStartColRel; // SumRange-StartCol
+ bool const bEndColRel; // SumRange-EndCol
};
m_pDoc->InsertTab(0, "Formula");
@@ -1217,10 +1217,10 @@ void Test::testFormulaCompilerImplicitIntersection1ParamNoChange()
{
struct TestCaseFormulaNoChange
{
- OUString aFormula;
- ScAddress aCellAddress;
- bool bMatrixFormula;
- bool bForcedArray;
+ OUString const aFormula;
+ ScAddress const aCellAddress;
+ bool const bMatrixFormula;
+ bool const bForcedArray;
};
m_pDoc->InsertTab(0, "Formula");
@@ -1314,9 +1314,9 @@ void Test::testFormulaCompilerImplicitIntersection1ParamWithChange()
{
struct TestCaseFormula
{
- OUString aFormula;
- ScAddress aCellAddress;
- ScAddress aArgAddr;
+ OUString const aFormula;
+ ScAddress const aCellAddress;
+ ScAddress const aArgAddr;
};
m_pDoc->InsertTab(0, "Formula");
@@ -1412,8 +1412,8 @@ void Test::testFormulaCompilerImplicitIntersectionOperators()
{
struct TestCase
{
- OUString formula[3];
- double result[3];
+ OUString const formula[3];
+ double const result[3];
};
m_pDoc->InsertTab(0, "Test");
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index e05dca044af0..f8a1da6235ef 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -35,14 +35,14 @@ namespace {
struct DPFieldDef
{
const char* pName;
- sheet::DataPilotFieldOrientation eOrient;
+ sheet::DataPilotFieldOrientation const eOrient;
/**
* Function for data field. It's used only for data field. When 0, the
* default function (SUM) is used.
*/
- ScGeneralFunction eFunc;
- bool bRepeatItemLabels;
+ ScGeneralFunction const eFunc;
+ bool const bRepeatItemLabels;
};
template<size_t Size>
@@ -2264,7 +2264,7 @@ void Test::testFuncGETPIVOTDATALeafAccess()
struct Check
{
const char* mpFormula;
- double mfResult;
+ double const mfResult;
};
Check aChecks[] = {
diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index 648918e67790..26287c09f617 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -472,8 +472,8 @@ void Test::testSortInFormulaGroup()
SortRefUpdateSetter aUpdateSet;
static struct {
- SCCOL nCol;
- SCROW nRow;
+ SCCOL const nCol;
+ SCROW const nRow;
const char *pData;
} aEntries[] = {
{ 0, 0, "3" }, { 1, 0, "=A1" },
@@ -506,9 +506,9 @@ void Test::testSortInFormulaGroup()
m_pDoc->Sort(0, aSortData, false, true, nullptr, nullptr);
static struct {
- SCCOL nCol;
- SCROW nRow;
- double fValue;
+ SCCOL const nCol;
+ SCROW const nRow;
+ double const fValue;
} aResults[] = {
{ 0, 0, 1.0 }, { 1, 0, 1.0 },
{ 0, 1, 2.0 }, { 1, 1, 3.0 },
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 25088b5a4106..48101b3849e4 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -63,10 +63,10 @@
struct ScSlotData
{
- SCROW nStartRow; // first row of this segment
- SCROW nStopRow; // first row of next segment
- SCSIZE nSlice; // slice size in this segment
- SCSIZE nCumulated; // cumulated slots of previous segments
+ SCROW const nStartRow; // first row of this segment
+ SCROW const nStopRow; // first row of next segment
+ SCSIZE const nSlice; // slice size in this segment
+ SCSIZE const nCumulated; // cumulated slots of previous segments
ScSlotData( SCROW r1, SCROW r2, SCSIZE s, SCSIZE c ) : nStartRow(r1), nStopRow(r2), nSlice(s), nCumulated(c) {}
};
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 84b107853914..b83caa0af361 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1322,7 +1322,7 @@ const OUStringLiteral a5Ratings[] = {
};
struct ScIconSetBitmapMap {
- ScIconSetType eType;
+ ScIconSetType const eType;
const OUStringLiteral* pBitmaps;
};
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index e6987e55dbaf..40afd6974861 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1248,7 +1248,7 @@ class CopyAsLinkHandler
ScColumn& mrDestCol;
sc::ColumnBlockPosition maDestPos;
sc::ColumnBlockPosition* mpDestPos;
- InsertDeleteFlags mnCopyFlags;
+ InsertDeleteFlags const mnCopyFlags;
sc::StartListeningType meListenType;
@@ -1384,10 +1384,10 @@ class CopyByCloneHandler
sc::ColumnBlockPosition maDestPos;
sc::ColumnBlockPosition* mpDestPos;
svl::SharedStringPool* mpSharedStringPool;
- InsertDeleteFlags mnCopyFlags;
+ InsertDeleteFlags const mnCopyFlags;
sc::StartListeningType meListenType;
- ScCloneFlags mnFormulaCellCloneFlags;
+ ScCloneFlags const mnFormulaCellCloneFlags;
void setDefaultAttrToDest(size_t nRow)
{
@@ -1873,8 +1873,8 @@ void resetColumnPosition(sc::CellStoreType& rCells, SCCOL nCol)
class NoteCaptionUpdater
{
- SCCOL mnCol;
- SCTAB mnTab;
+ SCCOL const mnCol;
+ SCTAB const mnTab;
public:
NoteCaptionUpdater( SCCOL nCol, SCTAB nTab ) : mnCol(nCol), mnTab(nTab) {}
@@ -2076,7 +2076,7 @@ public:
class UpdateRefOnCopy
{
const sc::RefUpdateContext& mrCxt;
- ScDocument* mpUndoDoc;
+ ScDocument* const mpUndoDoc;
bool mbUpdated;
public:
@@ -2508,9 +2508,9 @@ class UpdateTransHandler
{
ScColumn& mrColumn;
sc::CellStoreType::iterator miPos;
- ScRange maSource;
- ScAddress maDest;
- ScDocument* mpUndoDoc;
+ ScRange const maSource;
+ ScAddress const maDest;
+ ScDocument* const mpUndoDoc;
public:
UpdateTransHandler(ScColumn& rColumn, const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc) :
mrColumn(rColumn),
@@ -2531,9 +2531,9 @@ class UpdateGrowHandler
{
ScColumn& mrColumn;
sc::CellStoreType::iterator miPos;
- ScRange maArea;
- SCCOL mnGrowX;
- SCROW mnGrowY;
+ ScRange const maArea;
+ SCCOL const mnGrowX;
+ SCROW const mnGrowY;
public:
UpdateGrowHandler(ScColumn& rColumn, const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY) :
mrColumn(rColumn),
@@ -2555,7 +2555,7 @@ class InsertTabUpdater
sc::RefUpdateInsertTabContext& mrCxt;
sc::CellTextAttrStoreType& mrTextAttrs;
sc::CellTextAttrStoreType::iterator miAttrPos;
- SCTAB mnTab;
+ SCTAB const mnTab;
bool mbModified;
public:
@@ -2588,7 +2588,7 @@ class DeleteTabUpdater
sc::RefUpdateDeleteTabContext& mrCxt;
sc::CellTextAttrStoreType& mrTextAttrs;
sc::CellTextAttrStoreType::iterator miAttrPos;
- SCTAB mnTab;
+ SCTAB const mnTab;
bool mbModified;
public:
DeleteTabUpdater(sc::RefUpdateDeleteTabContext& rCxt, sc::CellTextAttrStoreType& rTextAttrs, SCTAB nTab) :
@@ -2619,8 +2619,8 @@ class InsertAbsTabUpdater
{
sc::CellTextAttrStoreType& mrTextAttrs;
sc::CellTextAttrStoreType::iterator miAttrPos;
- SCTAB mnTab;
- SCTAB mnNewPos;
+ SCTAB const mnTab;
+ SCTAB const mnNewPos;
bool mbModified;
public:
InsertAbsTabUpdater(sc::CellTextAttrStoreType& rTextAttrs, SCTAB nTab, SCTAB nNewPos) :
@@ -2652,7 +2652,7 @@ class MoveTabUpdater
sc::RefUpdateMoveTabContext& mrCxt;
sc::CellTextAttrStoreType& mrTextAttrs;
sc::CellTextAttrStoreType::iterator miAttrPos;
- SCTAB mnTab;
+ SCTAB const mnTab;
bool mbModified;
public:
MoveTabUpdater(sc::RefUpdateMoveTabContext& rCxt, sc::CellTextAttrStoreType& rTextAttrs, SCTAB nTab) :
@@ -2681,7 +2681,7 @@ public:
class UpdateCompileHandler
{
- bool mbForceIfNameInUse:1;
+ bool const mbForceIfNameInUse:1;
public:
explicit UpdateCompileHandler(bool bForceIfNameInUse) :
mbForceIfNameInUse(bForceIfNameInUse) {}
@@ -2694,7 +2694,7 @@ public:
class TabNoSetter
{
- SCTAB mnTab;
+ SCTAB const mnTab;
public:
explicit TabNoSetter(SCTAB nTab) : mnTab(nTab) {}
@@ -2956,7 +2956,7 @@ class CompileErrorCellsHandler
sc::CompileFormulaContext& mrCxt;
ScColumn& mrColumn;
sc::CellStoreType::iterator miPos;
- FormulaError mnErrCode;
+ FormulaError const mnErrCode;
bool mbCompiled;
public:
CompileErrorCellsHandler( sc::CompileFormulaContext& rCxt, ScColumn& rColumn, FormulaError nErrCode ) :
@@ -2996,7 +2996,7 @@ public:
class CalcAfterLoadHandler
{
sc::CompileFormulaContext& mrCxt;
- bool mbStartListening;
+ bool const mbStartListening;
public:
CalcAfterLoadHandler( sc::CompileFormulaContext& rCxt, bool bStartListening ) :
@@ -3023,7 +3023,7 @@ class FindEditCellsHandler
{
ScColumn& mrColumn;
sc::CellTextAttrStoreType::iterator miAttrPos;
- sc::CellStoreType::iterator miCellPos;
+ sc::CellStoreType::iterator const miCellPos;
public:
explicit FindEditCellsHandler(ScColumn& rCol) :
@@ -3384,8 +3384,8 @@ class RemoveEmptyBroadcasterHandler
{
sc::ColumnSpanSet maSet;
ScDocument& mrDoc;
- SCCOL mnCol;
- SCTAB mnTab;
+ SCCOL const mnCol;
+ SCTAB const mnTab;
public:
RemoveEmptyBroadcasterHandler( ScDocument& rDoc, SCCOL nCol, SCTAB nTab ) :
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index b9852ccc8778..07653661e13a 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -574,7 +574,7 @@ namespace {
class MaxStrLenFinder
{
ScDocument& mrDoc;
- sal_uInt32 mnFormat;
+ sal_uInt32 const mnFormat;
OUString maMaxLenStr;
sal_Int32 mnMaxLen;
@@ -1036,8 +1036,8 @@ class StrEntries
protected:
struct StrEntry
{
- SCROW mnRow;
- OUString maStr;
+ SCROW const mnRow;
+ OUString const maStr;
StrEntry(SCROW nRow, const OUString& rStr) : mnRow(nRow), maStr(rStr) {}
};
@@ -1121,7 +1121,7 @@ public:
class TestTabRefAbsHandler
{
- SCTAB mnTab;
+ SCTAB const mnTab;
bool mbTestResult;
public:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list