[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 12 06:32:44 UTC 2020
sc/inc/AccessibleFilterMenuItem.hxx | 2
sc/inc/ChartTools.hxx | 2
sc/inc/PivotTableDataProvider.hxx | 2
sc/inc/PivotTableDataSequence.hxx | 4
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 | 6
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 | 4
sc/inc/compiler.hxx | 14
sc/inc/confuno.hxx | 2
sc/inc/dapiuno.hxx | 10
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 | 44 +-
sc/inc/docoptio.hxx | 2
sc/inc/document.hxx | 6
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 | 7
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/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 | 4
sc/inc/recursionhelper.hxx | 4
sc/inc/reffind.hxx | 6
sc/inc/refhint.hxx | 14
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/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 | 14
sc/qa/unit/ucalc.cxx | 12
sc/qa/unit/ucalc.hxx | 2
sc/qa/unit/ucalc_column.cxx | 4
sc/qa/unit/ucalc_condformat.cxx | 4
sc/qa/unit/ucalc_formula.cxx | 46 +-
sc/qa/unit/ucalc_pivottable.cxx | 8
sc/source/core/data/bcaslot.cxx | 8
sc/source/core/data/colorscale.cxx | 2
sc/source/core/data/column.cxx | 44 +-
sc/source/core/data/column2.cxx | 32 -
sc/source/core/data/column3.cxx | 40 +-
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/documen8.cxx | 4
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 | 22 -
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/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 | 2
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 | 8
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 | 12
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/scenariobuffer.hxx | 4
sc/source/filter/inc/sheetdatabuffer.hxx | 2
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 | 14
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 | 4
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 | 24 -
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 | 18
sc/source/filter/oox/numberformatsbuffer.cxx | 8
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 | 36 -
sc/source/filter/xml/XMLCodeNameProvider.hxx | 4
sc/source/filter/xml/XMLConverter.cxx | 12
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 | 2
sc/source/filter/xml/editattributemap.hxx | 6
sc/source/filter/xml/pivotsource.hxx | 12
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 | 2
sc/source/filter/xml/xmlimprt.hxx | 6
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 | 2
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 12
sc/source/ui/Accessibility/AccessibleFilterMenu.cxx | 2
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/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 | 6
sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 2
sc/source/ui/inc/SamplingDialog.hxx | 10
sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 16
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 6
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/condformatdlgitem.hxx | 4
sc/source/ui/inc/condformatmgr.hxx | 2
sc/source/ui/inc/condformatuno.hxx | 22 -
sc/source/ui/inc/conflictsdlg.hxx | 12
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/dataprovider.hxx | 6
sc/source/ui/inc/datatransformation.hxx | 32 -
sc/source/ui/inc/dbnamdlg.hxx | 2
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 | 2
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 | 4
sc/source/ui/inc/scuiasciiopt.hxx | 2
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 | 4
sc/source/ui/inc/target.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 | 4
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 | 2
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 2
sc/source/ui/undo/undobase.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/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
372 files changed, 1496 insertions(+), 1492 deletions(-)
New commits:
commit 9d4c36d7914e2746a751a56de01063c9159f0f99
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Mar 11 16:35:10 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 12 07:31:50 2020 +0100
Revert "loplugin:constfields in sc"
This reverts commit fb1d3b580763a333bbbfe115d09e1b5cd8849675.
Now that we know that making fields has negative side effects
like disabling assignment operator generation.
Change-Id: Ib48334ffbeb2c768896dd8ced6818aa0b9910b0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90333
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index 20003ed13444..d45b4c2890e2 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -87,7 +87,7 @@ private:
css::uno::Reference< css::accessibility::XAccessibleStateSet > mxStateSet;
VclPtr<ScMenuFloatingWindow> mpWindow;
- size_t const mnMenuPos;
+ size_t mnMenuPos;
};
#endif
diff --git a/sc/inc/ChartTools.hxx b/sc/inc/ChartTools.hxx
index af0a4e807827..736142a056c6 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 const m_eChartSourceType;
+ ChartSourceType 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 90c98fc2f056..67c485dd6ff9 100644
--- a/sc/inc/PivotTableDataProvider.hxx
+++ b/sc/inc/PivotTableDataProvider.hxx
@@ -157,7 +157,7 @@ private:
ScDocument* m_pDocument;
OUString m_sPivotTableName;
- SfxItemPropertySet const m_aPropSet;
+ SfxItemPropertySet 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 5d6ab2403057..91d975e6a9c4 100644
--- a/sc/inc/PivotTableDataSequence.hxx
+++ b/sc/inc/PivotTableDataSequence.hxx
@@ -156,9 +156,9 @@ public:
private:
ScDocument* m_pDocument;
- OUString const m_aID;
+ OUString m_aID;
std::vector<ValueAndFormat> m_aData;
- SfxItemPropertySet const m_aPropSet;
+ SfxItemPropertySet 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 983aead0317d..3e39a77e16e0 100644
--- a/sc/inc/TablePivotChart.hxx
+++ b/sc/inc/TablePivotChart.hxx
@@ -38,8 +38,8 @@ class TablePivotChart final : public cppu::BaseMutex,
{
private:
ScDocShell* m_pDocShell;
- SCTAB const m_nTab; // Charts are per sheet
- OUString const m_aChartName;
+ SCTAB m_nTab; // Charts are per sheet
+ OUString m_aChartName;
public:
TablePivotChart(ScDocShell* pDocShell, SCTAB nTab, OUString const & rName);
diff --git a/sc/inc/TablePivotCharts.hxx b/sc/inc/TablePivotCharts.hxx
index b37ae04dd715..9c44632b2001 100644
--- a/sc/inc/TablePivotCharts.hxx
+++ b/sc/inc/TablePivotCharts.hxx
@@ -32,7 +32,7 @@ class TablePivotCharts final : public TablePivotCharts_Base, public SfxListener
{
private:
ScDocShell* m_pDocShell;
- SCTAB const m_nTab;
+ SCTAB m_nTab;
public:
TablePivotCharts(ScDocShell* pDocShell, SCTAB nTab);
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 1da45b96d55e..42509db957fb 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -81,19 +81,19 @@ public:
: maLocale( rLocale), maName( rName) { }
};
private:
- OUString const aOriginalName; ///< kept in formula
- OUString const aLocalName; ///< for display
- OUString aUpperName; ///< for entering formulas
- OUString aUpperLocal; ///< for entering formulas
- OUString const aDescription;
+ OUString aOriginalName; ///< kept in formula
+ OUString aLocalName; ///< for display
+ OUString aUpperName; ///< for entering formulas
+ OUString aUpperLocal; ///< for entering formulas
+ OUString aDescription;
css::uno::Reference< css::reflection::XIdlMethod> xFunction;
css::uno::Any aObject;
long nArgCount;
std::unique_ptr<ScAddInArgDesc[]>
pArgDescs;
long nCallerPos;
- sal_uInt16 const nCategory;
- OString const sHelpId;
+ sal_uInt16 nCategory;
+ OString sHelpId;
mutable ::std::vector< LocalizedName > maCompNames;
mutable bool bCompInitialized;
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx
index 6b7aea7c87b4..000c740e37e2 100644
--- a/sc/inc/addruno.hxx
+++ b/sc/inc/addruno.hxx
@@ -37,7 +37,7 @@ private:
ScDocShell* pDocShell;
ScRange aRange;
sal_Int32 nRefSheet;
- bool const bIsRange;
+ bool 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 d8100a1d3bd3..fca864ecf136 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -93,7 +93,7 @@ class ScAutoFormatObj : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
sal_uInt16 nFormatIndex;
ScAutoFormatFieldObj* GetObjectByIndex_Impl(sal_uInt16 nIndex);
@@ -156,9 +156,9 @@ class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet const aPropSet;
- sal_uInt16 const nFormatIndex;
- sal_uInt16 const nFieldIndex;
+ SfxItemPropertySet aPropSet;
+ sal_uInt16 nFormatIndex;
+ sal_uInt16 nFieldIndex;
public:
ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField);
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 3f042c0b507e..95578c9d4a15 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -84,7 +84,7 @@ class ScSpreadsheetSettings final : public cppu::WeakImplHelper<
css::lang::XServiceInfo>
{
private:
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
/// @throws css::uno::RuntimeException
bool getPropertyBool(const OUString& aPropertyName);
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 6a3ad78c7e44..b0238adcdd78 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -233,7 +233,7 @@ class ScAttrIterator
const ScPatternAttr* pDefPattern;
SCSIZE nPos;
SCROW nRow;
- SCROW const nEndRow;
+ SCROW 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 af17d9417e4a..3be8f87c922a 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* const pDoc;
+ ScDocument* pDoc;
SCTAB nCurrentTab;
public:
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index c8ccdb36f1a4..9bc119d27c0c 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -35,7 +35,7 @@ public:
class ScAreaChangedHint final : public SfxHint
{
private:
- ScRange const aNewRange;
+ ScRange 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 d64f9dfd5fe0..fd85ab1122b2 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -55,11 +55,11 @@ class LegacyFuncData
friend class LegacyFuncCollection;
const ModuleData* pModuleData;
- OUString const aInternalName;
- OUString const aFuncName;
- sal_uInt16 const nNumber;
- sal_uInt16 const nParamCount;
- ParamType const eAsyncType;
+ OUString aInternalName;
+ OUString aFuncName;
+ sal_uInt16 nNumber;
+ sal_uInt16 nParamCount;
+ ParamType eAsyncType;
ParamType eParamType[MAXFUNCPARAM];
public:
LegacyFuncData(const ModuleData*pModule,
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 5a937becad14..cd98a0b593de 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -120,7 +120,7 @@ namespace editeng { class SvxBorderLine; }
class ScLinkListener final : public SvtListener
{
- Link<const SfxHint&,void> const aLink;
+ Link<const SfxHint&,void> aLink;
public:
ScLinkListener(const Link<const SfxHint&,void>& rL) : aLink(rL) {}
virtual ~ScLinkListener() override;
@@ -1098,7 +1098,7 @@ class ScCellFormatsObj final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- ScRange const aTotalRange;
+ ScRange aTotalRange;
private:
ScCellRangeObj* GetObjectByIndex_Impl(long nIndex) const;
@@ -1134,7 +1134,7 @@ class ScCellFormatsEnumeration final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB const nTab;
+ SCTAB nTab;
std::unique_ptr<ScAttrRectIterator> pIter;
ScRange aNext;
bool bAtEnd;
diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx
index 4b877c661a1e..5a405779328f 100644
--- a/sc/inc/cellvalues.hxx
+++ b/sc/inc/cellvalues.hxx
@@ -29,8 +29,8 @@ struct CellValuesImpl;
struct CellValueSpan
{
- SCROW const mnRow1;
- SCROW const mnRow2;
+ SCROW mnRow1;
+ SCROW mnRow2;
CellValueSpan( SCROW nRow1, SCROW nRow2 );
};
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index dd9af3d09b66..21c61990b4f8 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -144,7 +144,7 @@ public:
private:
ScDocument* m_pDocument;
- SfxItemPropertySet const m_aPropSet;
+ SfxItemPropertySet m_aPropSet;
bool m_bIncludeHiddenCells;
};
@@ -374,7 +374,7 @@ private:
std::vector<ScTokenRef> m_aTokens;
RangeIndexMapPtr m_pRangeIndices;
ExtRefListenerPtr m_pExtRefListener;
- SfxItemPropertySet const m_aPropSet;
+ SfxItemPropertySet m_aPropSet;
std::unique_ptr<HiddenRangeListener> m_pHiddenListener;
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index ba44467b4a3e..d8caba172bfb 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 const maName;
+ OUString 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 ac79b8fb8ee8..0069b1a80c50 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 const nCount;
- SCCOL const nColCount;
- SCROW const nRowCount;
+ sal_uLong nCount;
+ SCCOL nColCount;
+ SCROW 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* const pDocument;
+ ScDocument* pDocument;
std::unique_ptr<ScChartPositionMap> pPositionMap;
ScChartGlue eGlue;
SCCOL nStartCol;
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 63b32afc79bc..e59a9ace0fbe 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -48,7 +48,7 @@ class ScChartsObj final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB const nTab; // Charts are per sheet
+ SCTAB nTab; // Charts are per sheet
ScChartObj* GetObjectByIndex_Impl(long nIndex) const;
ScChartObj* GetObjectByName_Impl(const OUString& aName) const;
@@ -106,8 +106,8 @@ class ScChartObj : public ::cppu::BaseMutex
{
private:
ScDocShell* pDocShell;
- SCTAB const nTab; // Charts are per sheet
- OUString const aChartName;
+ SCTAB nTab; // Charts are per sheet
+ OUString 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 21e846e69829..544e2566fdba 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -108,7 +108,7 @@ protected:
ScChangeActionLinkEntry* pNext;
ScChangeActionLinkEntry** ppPrev;
- ScChangeAction* const pAction;
+ ScChangeAction* pAction;
ScChangeActionLinkEntry* pLink;
public:
@@ -367,7 +367,7 @@ class SAL_DLLPUBLIC_RTTI ScChangeActionIns : public ScChangeAction
{
friend class ScChangeTrack;
- bool const mbEndOfList; /// whether or not a row was auto-inserted at the bottom.
+ bool mbEndOfList; /// whether or not a row was auto-inserted at the bottom.
ScChangeActionIns( const ScDocument* pDoc, const ScRange& rRange, bool bEndOfList = false );
@@ -405,8 +405,8 @@ class ScChangeActionDelMoveEntry final : public ScChangeActionLinkEntry
friend class ScChangeActionDel;
friend class ScChangeTrack;
- short const nCutOffFrom;
- short const nCutOffTo;
+ short nCutOffFrom;
+ short nCutOffTo;
inline ScChangeActionDelMoveEntry(
ScChangeActionDelMoveEntry** ppPrevP,
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index dd84c0e17501..9a69038bb0c7 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -52,9 +52,9 @@ class CopyFromClipContext final : public ClipContextBase
SCTAB mnTabStart;
SCTAB mnTabEnd;
ScDocument& mrDestDoc;
- ScDocument* const mpRefUndoDoc;
+ ScDocument* mpRefUndoDoc;
ScDocument* mpClipDoc;
- InsertDeleteFlags const mnInsertFlag;
+ InsertDeleteFlags mnInsertFlag;
InsertDeleteFlags mnDeleteFlag;
std::vector<ScCellValue> maSingleCells;
@@ -63,9 +63,9 @@ class CopyFromClipContext final : public ClipContextBase
std::vector<const ScPostIt*> maSingleNotes;
ScConditionalFormatList* mpCondFormatList;
- bool const mbAsLink:1;
- bool const mbSkipAttrForEmptyCells:1;
- bool const mbCloneNotes:1;
+ bool mbAsLink:1;
+ bool mbSkipAttrForEmptyCells:1;
+ bool mbCloneNotes:1;
bool mbTableProtected:1;
public:
@@ -134,7 +134,7 @@ public:
class CopyToClipContext final : public ClipContextBase
{
- bool const mbKeepScenarioFlags:1;
+ bool mbKeepScenarioFlags:1;
public:
CopyToClipContext(ScDocument& rDoc, bool bKeepScenarioFlags);
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 6a6253d75d1e..2f325c4d0f79 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -214,8 +214,8 @@ enum ScIconSetType
struct ScIconSetMap {
const char* pName;
- ScIconSetType const eType;
- sal_Int32 const nElements;
+ ScIconSetType eType;
+ sal_Int32 nElements;
};
class SC_DLLPUBLIC ScColorFormat : public ScFormatEntry
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 74fa4e8b37f9..576a88a8f71a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -123,7 +123,7 @@ class ScColumn
// Broadcasters for formula cells.
sc::BroadcasterStoreType maBroadcasters;
- sc::CellStoreEvent const maCellsEvent;
+ sc::CellStoreEvent maCellsEvent;
// Cell values.
sc::CellStoreType maCells;
diff --git a/sc/inc/columniterator.hxx b/sc/inc/columniterator.hxx
index a217b6d9dff0..46350afc32e9 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 const maPosEnd;
+ CellStoreType::const_position_type maPosEnd;
bool mbComplete;
public:
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index b76664c785c6..a2f7c7bf6cf9 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -27,8 +27,8 @@ class SingleColumnSpanSet;
struct RowSpan
{
- SCROW const mnRow1;
- SCROW const mnRow2;
+ SCROW mnRow1;
+ SCROW mnRow2;
RowSpan(SCROW nRow1, SCROW nRow2);
};
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index e60455177cfb..91933ae7865c 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -126,13 +126,13 @@ public:
} name;
struct {
sal_uInt16 nIndex;
- ScTableRefToken::Item const eItem;
- } const table;
+ ScTableRefToken::Item eItem;
+ } table;
struct {
rtl_uString* mpData;
rtl_uString* mpDataIgnoreCase;
} sharedstring;
- ScMatrix* const pMat;
+ ScMatrix* pMat;
FormulaError nError;
short nJump[ FORMULA_MAXJUMPCOUNT + 1 ]; // If/Chose token
};
@@ -299,7 +299,7 @@ private:
struct TableRefEntry
{
- ScTokenRef const mxToken;
+ ScTokenRef mxToken;
sal_uInt16 mnLevel;
TableRefEntry( formula::FormulaToken* p ) : mxToken(p), mnLevel(0) {}
};
@@ -311,9 +311,9 @@ private:
{
PendingImplicitIntersectionOptimization(formula::FormulaToken** p, formula::FormulaToken* o)
: parameterLocation( p ), parameter( *p ), operation( o ) {}
- formula::FormulaToken** const parameterLocation;
- formula::FormulaTokenRef const parameter;
- formula::FormulaTokenRef const operation;
+ formula::FormulaToken** parameterLocation;
+ formula::FormulaTokenRef parameter;
+ formula::FormulaTokenRef operation;
};
std::vector< PendingImplicitIntersectionOptimization > mPendingImplicitIntersectionOptimizations;
std::set<formula::FormulaTokenRef> mUnhandledPossibleImplicitIntersections;
diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx
index 7665ddac2497..59d7a61b2468 100644
--- a/sc/inc/confuno.hxx
+++ b/sc/inc/confuno.hxx
@@ -35,7 +35,7 @@ class ScDocumentConfiguration final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
public:
ScDocumentConfiguration(ScDocShell* pDocShell);
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 12a8e9d4db1c..7eefdecf332e 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -85,7 +85,7 @@ class ScDataPilotTablesObj final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB const nTab;
+ SCTAB nTab;
ScDataPilotTableObj* GetObjectByIndex_Impl( sal_Int32 nIndex );
ScDataPilotTableObj* GetObjectByName_Impl(const OUString& aName);
@@ -138,7 +138,7 @@ class SAL_DLLPUBLIC_RTTI ScDataPilotDescriptorBase :
public SfxListener
{
private:
- SfxItemPropertySet const maPropSet;
+ SfxItemPropertySet maPropSet;
ScDocShell* pDocShell;
public:
@@ -378,7 +378,7 @@ private:
ScDataPilotFieldObj* GetObjectByName_Impl( const OUString& rName ) const;
private:
- css::uno::Any const maOrient; /// Field orientation, no value = all fields.
+ css::uno::Any maOrient; /// Field orientation, no value = all fields.
};
typedef ::cppu::WeakImplHelper
@@ -469,7 +469,7 @@ public:
private:
css::uno::Reference< css::container::XIndexAccess >
mxItems;
- SfxItemPropertySet const maPropSet;
+ SfxItemPropertySet maPropSet;
css::uno::Any maOrient;
};
@@ -716,7 +716,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
- SfxItemPropertySet const maPropSet;
+ SfxItemPropertySet maPropSet;
sal_Int32 mnIndex;
};
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 14c06d4b4848..af66f16e09fe 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -115,7 +115,7 @@ class ScSubTotalDescriptorBase : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
ScSubTotalFieldObj* GetObjectByIndex_Impl(sal_uInt16 nIndex);
@@ -281,7 +281,7 @@ class ScFilterDescriptorBase : public cppu::WeakImplHelper<
public SfxListener
{
private:
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
ScDocShell* pDocSh;
public:
@@ -403,11 +403,11 @@ class ScDatabaseRangeObj : public cppu::WeakImplHelper<
private:
ScDocShell* pDocShell;
OUString aName;
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
std::vector< css::uno::Reference< css::util::XRefreshListener > >
aRefreshListeners;
- bool const bIsUnnamed;
- SCTAB const aTab;
+ bool bIsUnnamed;
+ SCTAB aTab;
private:
ScDBData* GetDBData_Impl() const;
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index c1fbdcde7bc8..98f3050db4ce 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -57,7 +57,7 @@ public:
const ScDefaultsOptions& GetDefaultsOptions() const { return theOptions; }
private:
- ScDefaultsOptions const theOptions;
+ ScDefaultsOptions theOptions;
};
// config item
diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx
index 5713afbab7a7..3bc31800072b 100644
--- a/sc/inc/defltuno.hxx
+++ b/sc/inc/defltuno.hxx
@@ -37,7 +37,7 @@ class ScDocDefaultsObj final : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SfxItemPropertyMap const aPropertyMap;
+ SfxItemPropertyMap aPropertyMap;
void ItemsChanged();
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx
index e2be0c46b4f9..0d699c8aa950 100644
--- a/sc/inc/detdata.hxx
+++ b/sc/inc/detdata.hxx
@@ -37,7 +37,7 @@ enum ScDetOpType
class ScDetOpData
{
ScAddress aPos;
- ScDetOpType const eOperation;
+ ScDetOpType eOperation;
public:
ScDetOpData( const ScAddress& rP, ScDetOpType eOp ) :
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index 6eb38f669c41..28394627e913 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -53,7 +53,7 @@ class ScDetectiveFunc
static bool bColorsInitialized;
ScDocument* pDoc;
- SCTAB const nTab;
+ SCTAB nTab;
enum class DrawPosMode
{
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 7308d6d4b4a3..f1092b1c1906 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -63,11 +63,11 @@ class ScValueIterator // walk through all values in an area
SCCOL mnCol;
SCTAB mnTab;
SCROW nAttrEndRow;
- SubtotalFlags const mnSubTotalFlags;
+ SubtotalFlags mnSubTotalFlags;
SvNumFormatType nNumFmtType;
bool bNumValid;
- bool const bCalcAsShown;
- bool const bTextAsZero;
+ bool bCalcAsShown;
+ bool bTextAsZero;
const sc::CellStoreType* mpCells;
PositionType maCurPos;
@@ -149,12 +149,12 @@ private:
const ScAttrArray* pAttrArray;
sal_uInt32 nNumFormat; // for CalcAsShown
sal_uInt32 nNumFmtIndex;
- SCCOL const nCol;
+ SCCOL nCol;
SCROW nRow;
SCROW nAttrEndRow;
- SCTAB const nTab;
+ SCTAB nTab;
SvNumFormatType nNumFmtType;
- bool const bCalcAsShown;
+ bool bCalcAsShown;
};
class DataAccessMatrix final : public DataAccess
@@ -215,7 +215,7 @@ class ScCellIterator
ScAddress maCurPos;
PositionType maCurColPos;
- SubtotalFlags const mnSubTotalFlags;
+ SubtotalFlags mnSubTotalFlags;
ScRefCellValue maCurCell;
@@ -398,8 +398,8 @@ private:
ScDocument* pDoc;
SCTAB nTab;
SCCOL nEndCol;
- SCROW const nStartRow;
- SCROW const nEndRow;
+ SCROW nStartRow;
+ SCROW nEndRow;
SCCOL nCol;
std::unique_ptr<ScAttrIterator>
pColIter;
@@ -419,8 +419,8 @@ private:
ScDocument* pDoc;
SCTAB nTab;
SCCOL nEndCol;
- SCROW const nStartRow;
- SCROW const nEndRow;
+ SCROW nStartRow;
+ SCROW nEndRow;
SCCOL nIterStartCol;
SCCOL nIterEndCol;
std::unique_ptr<ScAttrIterator>
@@ -449,10 +449,10 @@ class ScHorizontalCellIterator // walk through all non empty cells in an ar
ScDocument* pDoc;
SCTAB mnTab;
- SCCOL const nStartCol;
- SCCOL nEndCol;
- SCROW const nStartRow;
- SCROW const nEndRow;
+ SCCOL nStartCol;
+ SCCOL nEndCol;
+ SCROW nStartRow;
+ SCROW nEndRow;
SCCOL mnCol;
SCROW mnRow;
ScRefCellValue maCurCell;
@@ -489,7 +489,7 @@ private:
SCROW nCurRow;
SCTAB nCurTab;
SCROW nAttrEndRow;
- bool const bCalcAsShown;
+ bool bCalcAsShown;
public:
@@ -507,10 +507,10 @@ class ScHorizontalAttrIterator
private:
ScDocument* pDoc;
SCTAB nTab;
- SCCOL const nStartCol;
- SCROW const nStartRow;
+ SCCOL nStartCol;
+ SCROW nStartRow;
SCCOL nEndCol;
- SCROW const nEndRow;
+ SCROW nEndRow;
std::unique_ptr<SCROW[]> pNextEnd;
std::unique_ptr<SCCOL[]> pHorizEnd;
@@ -585,7 +585,7 @@ public:
private:
::std::set<SCROW>& mrBreaks;
::std::set<SCROW>::const_iterator maItr;
- ::std::set<SCROW>::const_iterator const maEnd;
+ ::std::set<SCROW>::const_iterator maEnd;
};
class ScDocRowHeightUpdater
@@ -615,8 +615,8 @@ private:
private:
ScDocument& mrDoc;
VclPtr<OutputDevice> mpOutDev;
- double const mfPPTX;
- double const mfPPTY;
+ double mfPPTX;
+ double mfPPTY;
const ::std::vector<TabRanges>* mpTabRangesArray;
};
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 9af25f3a2af4..66946b3cf15b 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -151,7 +151,7 @@ public:
const ScDocOptions& GetDocOptions() const { return theOptions; }
private:
- ScDocOptions const theOptions;
+ ScDocOptions theOptions;
};
// Config Item containing document options
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5355300047d4..847a4c42ccee 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -487,9 +487,9 @@ private:
// AutoCalcShellDisabled and TrackFormulas
bool bForcedFormulaPending;
bool bCalculatingFormulaTree;
- bool const bIsClip;
- bool const bIsUndo;
- bool const bIsFunctionAccess;
+ bool bIsClip;
+ bool bIsUndo;
+ bool bIsFunctionAccess;
bool bIsVisible; // set from view ctor
bool bIsEmbedded; // display/adjust Embedded area?
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 51dad2b24ce7..2c2195337741 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -94,7 +94,7 @@ class SC_DLLPUBLIC ScModelObj : public SfxBaseModel,
public css::sheet::opencl::XOpenCLSelection
{
private:
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
ScDocShell* pDocShell;
std::unique_ptr<ScPrintFuncCache> pPrintFuncCache;
std::unique_ptr<ScPrintUIOptions> pPrinterOptions;
@@ -511,9 +511,9 @@ class ScTableColumnsObj final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB const nTab;
- SCCOL const nStartCol;
- SCCOL const nEndCol;
+ SCTAB nTab;
+ SCCOL nStartCol;
+ SCCOL nEndCol;
ScTableColumnObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const;
ScTableColumnObj* GetObjectByName_Impl(const OUString& aName) const;
@@ -577,9 +577,9 @@ class ScTableRowsObj final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB const nTab;
- SCROW const nStartRow;
- SCROW const nEndRow;
+ SCTAB nTab;
+ SCROW nStartRow;
+ SCROW nEndRow;
ScTableRowObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const;
@@ -664,7 +664,7 @@ class SAL_DLLPUBLIC_RTTI ScAnnotationsObj final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB const nTab; ///< Collection belongs to the sheet
+ SCTAB nTab; ///< Collection belongs to the sheet
bool GetAddressByIndex_Impl( sal_Int32 nIndex, ScAddress& rPos ) const;
ScAnnotationObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const;
@@ -709,7 +709,7 @@ class ScScenariosObj final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SCTAB const nTab;
+ SCTAB 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 3cf13951609a..95ee95f4e5b3 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 const maItem;
+ ScDPItemData maItem;
};
/** multi-item (group) filter. */
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index da7e9c078524..4616cde16938 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -123,7 +123,7 @@ class ScDPGroupTableData final : public ScDPTableData
ScDPGroupDimensionVec aGroups;
std::unique_ptr<ScDPNumGroupDimension[]>
pNumGroups; // array[nSourceCount]
- ScDocument* const pDoc;
+ ScDocument* pDoc;
void FillGroupValues(std::vector<SCROW>& rItems, const std::vector<long>& rDims);
virtual long GetSourceDim( long nDim ) override;
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index c17cb53e43c9..e006b1800bf5 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -292,7 +292,7 @@ public:
typedef std::vector<ScRange> RangeIndexType;
CachesType m_Caches;
RangeIndexType maRanges;
- ScDocument* const mpDoc;
+ ScDocument* mpDoc;
public:
SheetCaches(ScDocument* pDoc);
bool hasCache(const ScRange& rRange) const;
@@ -319,7 +319,7 @@ public:
friend class ScDPCollection;
typedef ::std::map<OUString, std::unique_ptr<ScDPCache>> CachesType;
CachesType m_Caches;
- ScDocument* const mpDoc;
+ ScDocument* mpDoc;
public:
NameCaches(ScDocument* pDoc);
bool hasCache(const OUString& rName) const;
@@ -340,9 +340,9 @@ public:
*/
struct DBType
{
- sal_Int32 const mnSdbType;
- OUString const maDBName;
- OUString const maCommand;
+ sal_Int32 mnSdbType;
+ OUString maDBName;
+ OUString maCommand;
DBType(sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand);
struct less
@@ -359,7 +359,7 @@ public:
friend class ScDPCollection;
typedef ::std::map<DBType, std::unique_ptr<ScDPCache>, DBType::less> CachesType;
CachesType m_Caches;
- ScDocument* const mpDoc;
+ ScDocument* 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 5e1ca0b3e2de..b0ed7bb1b1fe 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -77,7 +77,7 @@ private:
SCROW nDataStartRow;
SCCOL nTabEndCol;
SCROW nTabEndRow;
- bool const bDoFilter:1;
+ bool bDoFilter:1;
bool bResultsError:1;
bool bSizesValid:1;
bool bSizeOverflow:1;
diff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxx
index 59ab88bc917d..3ffb052d7454 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 const maOutRange;
+ ScRange maOutRange;
sal_uInt32 mnRowFields; /// number of row fields
sal_uInt32 mnColumnFields;
sal_uInt32 mnPageFields;
sal_uInt32 mnDataFields;
FieldType meDataLayoutType;
- bool const mbShowFilter;
+ bool mbShowFilter;
bool mbHeaderLayout;
bool mbCompactMode; // MSO only setting
};
diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx
index a66a8469f987..e0f036e37898 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 const maDimName;
+ OUString maDimName;
OUString maValueName;
OUString maValue;
bool mbHasValue:1;
- bool const mbDataLayout:1;
+ bool mbDataLayout:1;
ScDPResultFilter(const OUString& rDimName, bool bDataLayout);
};
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 13eeb5fc5135..cdeb14779b43 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -58,8 +58,8 @@ class ScDPInitState
public:
struct Member
{
- long const mnSrcIndex;
- SCROW const mnNameIndex;
+ long mnSrcIndex;
+ SCROW mnNameIndex;
Member(long nSrcIndex, SCROW nNameIndex);
};
@@ -123,8 +123,8 @@ public:
void RemoveRowIndex();
private:
- ScDPResultMember* const pColResRoot;
- ScDPResultMember* const pRowResRoot;
+ ScDPResultMember* pColResRoot;
+ ScDPResultMember* pRowResRoot;
mutable IndexArray maColVisible;
mutable IndexArray maColSorted;
@@ -135,7 +135,7 @@ private:
struct ScDPRelativePos
{
long nBasePos; // simple count, without sort order applied
- long const nDirection;
+ long nDirection;
ScDPRelativePos( long nBase, long nDir );
};
@@ -247,7 +247,7 @@ private:
const ::std::vector<ScDPDimension*>& mppDim;
const ::std::vector<ScDPLevel*>& mppLev;
- bool const mbRow:1;
+ bool mbRow:1;
bool mbInitChild:1;
bool mbAllChildren:1;
public:
@@ -330,11 +330,11 @@ class ScDPResultMember
{
private:
const ScDPResultData* pResultData;
- ScDPParentDimData const aParentDimData;
+ ScDPParentDimData aParentDimData;
std::unique_ptr<ScDPResultDimension> pChildDimension;
std::unique_ptr<ScDPDataMember> pDataRoot;
bool bHasElements:1;
- bool const bForceSubTotal:1;
+ bool bForceSubTotal:1;
bool bHasHiddenDetails:1;
bool bInitialized:1;
bool bAutoHidden:1;
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index d0f23365fdc6..8125d0640ab5 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -264,7 +264,7 @@ class ScDPDimension : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
ScDPSource* pSource;
- long const nDim; // dimension index (== column ID)
+ long nDim; // dimension index (== column ID)
rtl::Reference<ScDPHierarchies> mxHierarchies;
ScGeneralFunction nFunction;
OUString aName; // if empty, take from source
@@ -345,8 +345,8 @@ class ScDPHierarchies : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- ScDPSource* const pSource;
- long const nDim;
+ ScDPSource* pSource;
+ long 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;
@@ -381,9 +381,9 @@ class ScDPHierarchy : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- ScDPSource* const pSource;
- long const nDim;
- long const nHier;
+ ScDPSource* pSource;
+ long nDim;
+ long nHier;
rtl::Reference<ScDPLevels> mxLevels;
public:
@@ -412,8 +412,8 @@ class ScDPLevels : public cppu::WeakImplHelper<
{
private:
ScDPSource* pSource;
- long const nDim;
- long const nHier;
+ long nDim;
+ long nHier;
long nLevCount;
std::unique_ptr<rtl::Reference<ScDPLevel>[]>
ppLevs;
@@ -449,9 +449,9 @@ class ScDPLevel : public cppu::WeakImplHelper<
{
private:
ScDPSource* pSource;
- long const nDim;
- long const nHier;
- long const nLev;
+ long nDim;
+ long nHier;
+ long nLev;
rtl::Reference<ScDPMembers> mxMembers;
css::uno::Sequence<sal_Int16> aSubTotals;
css::sheet::DataPilotFieldSortInfo aSortInfo; // stored user settings
@@ -553,7 +553,7 @@ private:
ScDPSource* pSource;
long nDim;
long nHier;
- long const nLev;
+ long nLev;
long nMbrCount;
mutable MembersType maMembers;
mutable ScDPMembersHashMap aHashMap;
@@ -600,10 +600,10 @@ class ScDPMember : public cppu::WeakImplHelper<
private:
ScDPSource* pSource;
long nDim;
- long const nHier;
- long const nLev;
+ long nHier;
+ long nLev;
- SCROW const mnDataId;
+ SCROW mnDataId;
std::optional<OUString> mpLayoutName;
sal_Int32 nPosition; // manual sorting
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 3fa25a13f2ff..fa88a4af63f1 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -33,7 +33,7 @@ class ScMarkData;
class ScTabDeletedHint final : public SfxHint
{
private:
- SCTAB const nTab;
+ SCTAB nTab;
public:
ScTabDeletedHint( SCTAB nTabNo );
virtual ~ScTabDeletedHint() override;
@@ -44,7 +44,7 @@ public:
class ScTabSizeChangedHint final : public SfxHint
{
private:
- SCTAB const nTab;
+ SCTAB nTab;
public:
ScTabSizeChangedHint( SCTAB nTabNo );
virtual ~ScTabSizeChangedHint() override;
@@ -58,10 +58,10 @@ public:
class ScUndoObjData final : public SdrUndoObj
{
private:
- ScAddress const aOldStt;
- ScAddress const aOldEnd;
- ScAddress const aNewStt;
- ScAddress const aNewEnd;
+ ScAddress aOldStt;
+ ScAddress aOldEnd;
+ ScAddress aNewStt;
+ ScAddress aNewEnd;
public:
ScUndoObjData( SdrObject* pObj, const ScAddress& rOS, const ScAddress& rOE,
const ScAddress& rNS, const ScAddress& rNE );
@@ -76,8 +76,8 @@ class ScUndoAnchorData final : public SdrUndoObj
private:
bool mbWasCellAnchored;
bool mbWasResizeWithCell;
- ScDocument* const mpDoc;
- SCTAB const mnTab;
+ ScDocument* mpDoc;
+ SCTAB mnTab;
public:
ScUndoAnchorData( SdrObject* pObj, ScDocument* pDoc, SCTAB nTab );
virtual ~ScUndoAnchorData() override;
@@ -89,7 +89,7 @@ public:
class SC_DLLPUBLIC ScDrawLayer final : public FmFormModel
{
private:
- OUString const aName;
+ OUString aName;
ScDocument* pDoc;
std::unique_ptr<SdrUndoGroup> pUndoGroup;
bool bRecording;
diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx
index fd4ab6785d0c..0300f3f61d81 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 const mnTab;
- SCCOL const mnCol;
- SCROW const mnRow;
+ SCTAB mnTab;
+ SCCOL mnCol;
+ SCROW mnRow;
};
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index 9257b935bc3a..4ad2d7eabf5a 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -96,7 +96,7 @@ class ScAnnotationEditSource final : public SvxEditSource, public SfxListener
{
private:
ScDocShell* pDocShell;
- ScAddress const aCellPos;
+ ScAddress aCellPos;
std::unique_ptr<ScEditEngineDefaulter> pEditEngine;
std::unique_ptr<SvxEditEngineForwarder> pForwarder;
bool bDataValid;
@@ -118,7 +118,7 @@ public:
class ScSimpleEditSource final : public SvxEditSource
{
private:
- SvxTextForwarder* const pForwarder;
+ SvxTextForwarder* pForwarder;
public:
ScSimpleEditSource( SvxTextForwarder* pForw );
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index f1da9fe2784b..95543f39f768 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -37,14 +37,14 @@ class ScEditEngineDefaulter;
class ScEditUtil
{
ScDocument* pDoc;
- SCCOL const nCol;
- SCROW const nRow;
- SCTAB const nTab;
- Point const aScrPos;
+ SCCOL nCol;
+ SCROW nRow;
+ SCTAB nTab;
+ Point aScrPos;
VclPtr<OutputDevice> pDev; // MapMode has to be set
- double const nPPTX;
- double const nPPTY;
- Fraction const aZoomX;
+ double nPPTX;
+ double nPPTY;
+ Fraction aZoomX;
Fraction aZoomY;
public:
@@ -104,9 +104,9 @@ public:
class ScEnginePoolHelper
{
protected:
- SfxItemPool* const pEnginePool;
+ SfxItemPool* pEnginePool;
SfxItemSet* pDefaults;
- bool const bDeleteEnginePool;
+ bool bDeleteEnginePool;
bool bDeleteDefaults;
ScEnginePoolHelper( SfxItemPool* pEnginePool, bool bDeleteEnginePool );
@@ -174,7 +174,7 @@ public:
class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter
{
private:
- ScDocument* const mpDoc;
+ ScDocument* mpDoc;
bool bExecuteURL;
public:
diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx
index 5230a823da5e..145c73ceaa6e 100644
--- a/sc/inc/eventuno.hxx
+++ b/sc/inc/eventuno.hxx
@@ -36,7 +36,7 @@ class ScSheetEventsObj final : public cppu::WeakImplHelper<
{
private:
ScDocShell* mpDocShell;
- SCTAB const mnTab;
+ SCTAB mnTab;
public:
ScSheetEventsObj(ScDocShell* pDocSh, SCTAB nT);
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 128feab61894..835ddd106bf4 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -70,8 +70,9 @@ private:
ScExternalRefLink() = delete;
ScExternalRefLink(const ScExternalRefLink&) = delete;
- sal_uInt16 const mnFileId;
- ScDocument* const mpDoc;
+ sal_uInt16 mnFileId;
+ OUString maFilterName;
+ ScDocument* mpDoc;
bool mbDoRefresh;
};
@@ -396,7 +397,7 @@ public:
~ApiGuard();
private:
ScExternalRefManager* mpMgr;
- bool const mbOldInteractionEnabled;
+ bool mbOldInteractionEnabled;
};
private:
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 1b71791eb8f4..ede2d9a1607b 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -61,7 +61,7 @@ class ScCellFieldsObj final : public cppu::WeakImplHelper<
private:
css::uno::Reference<css::text::XTextRange> mxContent;
ScDocShell* pDocShell;
- ScAddress const aCellPos;
+ ScAddress aCellPos;
std::unique_ptr<ScEditSource> mpEditSource;
/// List of refresh listeners.
std::unique_ptr<comphelper::OInterfaceContainerHelper2> mpRefreshListeners;
@@ -176,7 +176,7 @@ class ScEditFieldObj final : public cppu::WeakImplHelper<
std::unique_ptr<ScEditSource> mpEditSource;
ESelection aSelection;
- sal_Int32 const meType;
+ sal_Int32 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 1b945991bd23..0e17f179cc58 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 const mnArrCapacity;
+ SCSIZE mnArrCapacity;
bool mbPageMode;
explicit ScTableInfo(const SCSIZE capacity = 1024);
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index ca259517f9da..1625df961738 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -162,7 +162,7 @@ class ScTableValidationObj final : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
ScConditionMode nMode;
OUString aExpr1;
OUString aExpr2;
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 7f16ab3f64b7..e0669d471e2d 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** const mpCells; // pointer to the top formula cell in a shared group.
+ ScFormulaCell** mpCells; // pointer to the top formula cell in a shared group.
};
- size_t const mnRow;
- size_t const mnLength;
- bool const mbShared;
+ size_t mnRow;
+ size_t mnLength;
+ bool mbShared;
FormulaGroupEntry( ScFormulaCell** pCells, size_t nRow, size_t nLength );
@@ -60,8 +60,8 @@ struct FormulaGroupContext
struct ColKey
{
- SCTAB const mnTab;
- SCCOL const mnCol;
+ SCTAB mnTab;
+ SCCOL mnCol;
struct Hash
{
diff --git a/sc/inc/formulaiter.hxx b/sc/inc/formulaiter.hxx
index 660a201836da..2695255424f0 100644
--- a/sc/inc/formulaiter.hxx
+++ b/sc/inc/formulaiter.hxx
@@ -34,7 +34,7 @@ class ScDetectiveRefIter
private:
const ScDocument* mpDoc;
formula::FormulaTokenArrayPlainIterator maIter;
- ScAddress const aPos;
+ ScAddress aPos;
public:
ScDetectiveRefIter( const ScDocument* pDoc, ScFormulaCell* pCell );
bool GetNextRef( ScRange& rRange );
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 3c6685d38b75..e8edefec1d68 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -92,7 +92,7 @@ public:
const ScFormulaOptions& GetFormulaOptions() const { return theOptions; }
private:
- ScFormulaOptions const theOptions;
+ ScFormulaOptions theOptions;
};
// config item
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 32134b460182..a52be96c3832 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -35,7 +35,7 @@ struct FormulaResultValue
{
enum Type { Invalid, Value, String, Error };
- Type const meType;
+ Type meType;
double mfValue;
svl::SharedString maString;
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index 0150b5a95310..fa7f7eab4a0e 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -288,7 +288,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 const m_nCategory; /**< index number of this category */
+ sal_uInt32 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 511fbdfdfa05..fa370de19241 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -62,7 +62,7 @@ class ScFunctionAccess final : public cppu::WeakImplHelper<
private:
ScTempDocCache aDocCache;
std::unique_ptr<ScDocOptions> pOptions;
- SfxItemPropertyMap const aPropertyMap;
+ SfxItemPropertyMap aPropertyMap;
bool mbArray;
bool mbValid;
diff --git a/sc/inc/grouparealistener.hxx b/sc/inc/grouparealistener.hxx
index e892ded9a45c..72db1aa31d42 100644
--- a/sc/inc/grouparealistener.hxx
+++ b/sc/inc/grouparealistener.hxx
@@ -31,8 +31,8 @@ class FormulaGroupAreaListener final : public SvtListener
const ScColumn* mpColumn;
SCROW mnTopCellRow;
SCROW mnGroupLen;
- bool const mbStartFixed;
- bool const mbEndFixed;
+ bool mbStartFixed;
+ bool mbEndFixed;
public:
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 04d853026c38..203beb97de16 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -27,8 +27,8 @@
class SC_DLLPUBLIC ScPaintHint final : public SfxHint
{
- ScRange const aRange;
- PaintPartFlags const nParts;
+ ScRange aRange;
+ PaintPartFlags nParts;
bool bPrint; // flag indicating whether print/preview if affected
public:
@@ -49,11 +49,11 @@ public:
class ScUpdateRefHint final : public SfxHint
{
- UpdateRefMode const eUpdateRefMode;
- ScRange const aRange;
- SCCOL const nDx;
- SCROW const nDy;
- SCTAB const nDz;
+ UpdateRefMode eUpdateRefMode;
+ ScRange aRange;
+ SCCOL nDx;
+ SCROW nDy;
+ SCTAB nDz;
public:
ScUpdateRefHint( UpdateRefMode eMode, const ScRange& rR,
@@ -102,10 +102,10 @@ public:
class ScAutoStyleHint final : public SfxHint
{
- ScRange const aRange;
- OUString const aStyle1;
- OUString const aStyle2;
- sal_uLong const nTimeout;
+ ScRange aRange;
+ OUString aStyle1;
+ OUString aStyle2;
+ sal_uLong nTimeout;
public:
ScAutoStyleHint( const ScRange& rR, const OUString& rSt1,
@@ -120,7 +120,7 @@ public:
class ScDBRangeRefreshedHint final : public SfxHint
{
- ScImportParam const aParam;
+ ScImportParam aParam;
public:
ScDBRangeRefreshedHint( const ScImportParam& rP );
@@ -131,7 +131,7 @@ public:
class ScDataPilotModifiedHint final : public SfxHint
{
- OUString const maName;
+ OUString maName;
public:
ScDataPilotModifiedHint( const OUString& rName );
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 2ace1d5c85f4..d1a93f2ed6cd 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -56,7 +56,7 @@ class ScSheetLinkObj final : public cppu::WeakImplHelper<
public SfxListener
{
private:
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
ScDocShell* pDocShell;
OUString aFileName;
XRefreshListenerArr_Impl aRefreshListeners;
@@ -162,9 +162,9 @@ class ScAreaLinkObj final : public cppu::WeakImplHelper<
public SfxListener
{
private:
- SfxItemPropertySet const aPropSet;
- ScDocShell* pDocShell;
- size_t const nPos;
+ SfxItemPropertySet aPropSet;
+ ScDocShell* pDocShell;
+ size_t nPos;
XRefreshListenerArr_Impl aRefreshListeners;
void Modify_Impl( const OUString* pNewFile, const OUString* pNewFilter,
@@ -275,10 +275,10 @@ class ScDDELinkObj final : public cppu::WeakImplHelper<
public SfxListener
{
private:
- ScDocShell* pDocShell;
- OUString const aAppl;
- OUString const aTopic;
- OUString const aItem;
+ ScDocShell* pDocShell;
+ OUString aAppl;
+ OUString aTopic;
+ OUString aItem;
XRefreshListenerArr_Impl aRefreshListeners;
void Refreshed_Impl();
@@ -388,7 +388,7 @@ private:
private:
ScDocShell* mpDocShell;
ScExternalRefCache::TableTypeRef mpTable;
- size_t const mnIndex;
+ size_t mnIndex;
};
class ScExternalDocLinkObj final : public cppu::WeakImplHelper< css::sheet::XExternalDocLink >
@@ -422,9 +422,9 @@ public:
virtual sal_Int32 SAL_CALL getTokenIndex() override;
private:
- ScDocShell* const mpDocShell;
+ ScDocShell* mpDocShell;
ScExternalRefManager* mpRefMgr;
- sal_uInt16 const mnFileId;
+ sal_uInt16 mnFileId;
};
/** This is the UNO API equivalent of ScExternalRefManager. */
@@ -459,7 +459,7 @@ private:
ScExternalDocLinksObj(const ScExternalDocLinksObj&) = delete;
private:
- ScDocShell* const mpDocShell;
+ ScDocShell* mpDocShell;
ScExternalRefManager* mpRefMgr;
};
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index a02d89a375a4..8d62022c28bc 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -45,7 +45,7 @@ class EndListeningContext
ScDocument& mrDoc;
ColumnSpanSet maSet;
std::shared_ptr<ColumnBlockPositionSet> mpPosSet;
- ScTokenArray* const mpOldCode;
+ ScTokenArray* 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 8a4f59d731da..820fa3d6be4e 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -151,9 +151,9 @@ private:
struct QueryKey
{
- SCROW const mnRow;
- SCTAB const mnTab;
- QueryOp const meOp;
+ SCROW mnRow;
+ SCTAB mnTab;
+ QueryOp meOp;
QueryKey( const ScAddress & rAddress, const QueryOp eOp ) :
mnRow( rAddress.Row()),
@@ -180,7 +180,7 @@ private:
struct QueryCriteriaAndResult
{
- QueryCriteria const maCriteria;
+ QueryCriteria maCriteria;
ScAddress maAddress;
QueryCriteriaAndResult( const QueryCriteria & rCriteria, const ScAddress & rAddress ) :
@@ -191,7 +191,7 @@ private:
};
std::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash > maQueryMap;
- ScRange const maRange;
+ ScRange maRange;
ScDocument * mpDoc;
ScLookupCacheMap & mCacheMap;
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index 7a851ddba9e8..62a6f4cd9350 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -79,7 +79,7 @@ class ScIndexEnumeration final : public cppu::WeakImplHelper<
{
private:
css::uno::Reference<css::container::XIndexAccess> xIndex;
- OUString const sServiceName;
+ OUString sServiceName;
sal_Int32 nPos;
public:
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index c1bfb565cf91..36b7df5be121 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -253,7 +253,7 @@ class ScLabelRangeObj final : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- bool const bColumn;
+ bool bColumn;
ScRange aRange; ///< criterion to find range
private:
@@ -286,7 +286,7 @@ class ScLabelRangesObj final : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- bool const bColumn;
+ bool bColumn;
ScLabelRangeObj* GetObjectByIndex_Impl(size_t nIndex);
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index 5e141b5ddea1..ed9289124254 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -98,7 +98,7 @@ private:
private:
ScDocShell* pDocShell;
- ScAddress const aCellPos;
+ ScAddress aCellPos;
rtl::Reference<SvxUnoText> pUnoText;
};
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index f335ae226d7f..b18c437f0f51 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -32,7 +32,7 @@ struct ScOrcusXMLTreeParam
struct EntryData
{
size_t mnNamespaceID; /// numerical ID for xml namespace
- EntryType const meType;
+ EntryType 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 367659959891..128e4cd49022 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -363,7 +363,7 @@ namespace sc {
struct NoteEntry
{
- ScAddress const maPos;
+ ScAddress maPos;
const ScPostIt* mpNote;
NoteEntry( const ScAddress& rPos, const ScPostIt* pNote );
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index d305a8830dd9..c576f0877bd8 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -65,7 +65,7 @@ public:
const ScPrintOptions& GetPrintOptions() const { return theOptions; }
private:
- ScPrintOptions const theOptions;
+ ScPrintOptions theOptions;
};
// config item
diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx
index e1e81991e111..ca928f908dd1 100644
--- a/sc/inc/prnsave.hxx
+++ b/sc/inc/prnsave.hxx
@@ -50,7 +50,7 @@ public:
class ScPrintRangeSaver
{
- SCTAB const nTabCount;
+ SCTAB nTabCount;
std::unique_ptr<ScPrintSaverTab[]> pData;
public:
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index d7b52374e14d..ee684fcc1e61 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -182,7 +182,7 @@ protected:
ScDBQueryParamBase(DataType eType);
private:
- DataType const meType;
+ DataType meType;
};
struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTable
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 93d9e49effd4..6e19873f63d7 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -67,8 +67,8 @@ public:
};
private:
- OUString const aName;
- OUString const aUpperName; // #i62977# for faster searching (aName is never modified after ctor)
+ OUString aName;
+ OUString 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;
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index f741aa8bab67..2c7a6605042e 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -31,8 +31,8 @@ class ScFormulaCell;
struct ScFormulaRecursionEntry
{
- ScFormulaCell* const pCell;
- bool const bOldRunning;
+ ScFormulaCell* pCell;
+ bool bOldRunning;
ScFormulaResult aPreviousResult;
ScFormulaRecursionEntry(
ScFormulaCell* p, bool bR, const ScFormulaResult & rRes ) :
diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx
index d5e21f5e86f3..9cb3bd00b924 100644
--- a/sc/inc/reffind.hxx
+++ b/sc/inc/reffind.hxx
@@ -27,9 +27,9 @@ class ScDocument;
class ScRefFinder
{
OUString maFormula;
- formula::FormulaGrammar::AddressConvention const meConv;
- ScDocument* const mpDoc;
- ScAddress const maPos;
+ formula::FormulaGrammar::AddressConvention meConv;
+ ScDocument* mpDoc;
+ ScAddress maPos;
sal_Int32 mnFound;
sal_Int32 mnSelStart;
sal_Int32 mnSelEnd;
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index a312ec5b2842..76ec84300585 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -29,7 +29,7 @@ public:
};
private:
- Type const meType;
+ Type meType;
protected:
RefHint( Type eType );
@@ -49,9 +49,9 @@ public:
class RefColReorderHint final : public RefHint
{
const sc::ColRowReorderMapType& mrColMap;
- SCTAB const mnTab;
- SCROW const mnRow1;
- SCROW const mnRow2;
+ SCTAB mnTab;
+ SCROW mnRow1;
+ SCROW mnRow2;
public:
RefColReorderHint( const sc::ColRowReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 );
@@ -72,9 +72,9 @@ public:
class RefRowReorderHint final : public RefHint
{
const sc::ColRowReorderMapType& mrRowMap;
- SCTAB const mnTab;
- SCCOL const mnCol1;
- SCCOL const mnCol2;
+ SCTAB mnTab;
+ SCCOL mnCol1;
+ SCCOL 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 bc86cb9e1afe..39a46f6ac0ac 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -117,8 +117,8 @@ struct RefUpdateResult
struct SC_DLLPUBLIC RefUpdateInsertTabContext
{
ScDocument& mrDoc;
- SCTAB const mnInsertPos;
- SCTAB const mnSheets;
+ SCTAB mnInsertPos;
+ SCTAB mnSheets;
UpdatedRangeNames maUpdatedNames;
RefUpdateInsertTabContext(ScDocument& rDoc, SCTAB nInsertPos, SCTAB nSheets);
@@ -127,8 +127,8 @@ struct SC_DLLPUBLIC RefUpdateInsertTabContext
struct SC_DLLPUBLIC RefUpdateDeleteTabContext
{
ScDocument& mrDoc;
- SCTAB const mnDeletePos;
- SCTAB const mnSheets;
+ SCTAB mnDeletePos;
+ SCTAB mnSheets;
UpdatedRangeNames maUpdatedNames;
RefUpdateDeleteTabContext(ScDocument& rDoc, SCTAB nInsertPos, SCTAB nSheets);
@@ -137,8 +137,8 @@ struct SC_DLLPUBLIC RefUpdateDeleteTabContext
struct RefUpdateMoveTabContext
{
ScDocument& mrDoc;
- SCTAB const mnOldPos;
- SCTAB const mnNewPos;
+ SCTAB mnOldPos;
+ SCTAB mnNewPos;
UpdatedRangeNames maUpdatedNames;
RefUpdateMoveTabContext(ScDocument& rDoc, SCTAB nOldPos, SCTAB nNewPos);
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index 07becd39fd88..06da424c444c 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -24,10 +24,10 @@ class SC_DLLPUBLIC RowHeightContext
{
ScFlatUInt16RowSegments maHeights;
- double const mfPPTX;
- double const mfPPTY;
- Fraction const maZoomX;
- Fraction const maZoomY;
+ double mfPPTX;
+ double mfPPTY;
+ Fraction maZoomX;
+ Fraction maZoomY;
VclPtr<OutputDevice> mpOutDev;
sal_uInt16 mnExtraHeight;
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index b71154330e96..ac78fb428060 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -23,7 +23,7 @@ namespace sc {
class SC_DLLPUBLIC AutoCalcSwitch
{
ScDocument& mrDoc;
- bool const mbOldValue;
+ bool mbOldValue;
AutoCalcSwitch(AutoCalcSwitch const &) = delete;
AutoCalcSwitch(AutoCalcSwitch &&) = delete;
@@ -38,7 +38,7 @@ public:
class ExpandRefsSwitch
{
ScDocument& mrDoc;
- bool const mbOldValue;
+ bool mbOldValue;
public:
ExpandRefsSwitch(ScDocument& rDoc, bool bExpandRefs);
~ExpandRefsSwitch();
@@ -47,7 +47,7 @@ public:
class SC_DLLPUBLIC UndoSwitch
{
ScDocument& mrDoc;
- bool const mbOldValue;
+ bool mbOldValue;
public:
UndoSwitch(ScDocument& rDoc, bool bUndo);
~UndoSwitch();
@@ -56,7 +56,7 @@ public:
class IdleSwitch
{
ScDocument& mrDoc;
- bool const mbOldValue;
+ bool mbOldValue;
public:
IdleSwitch(ScDocument& rDoc, bool bEnableIdle);
~IdleSwitch();
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
index 9d36ee9b52c7..e214eafbc2d7 100644
--- a/sc/inc/sheetdata.hxx
+++ b/sc/inc/sheetdata.hxx
@@ -51,7 +51,7 @@ struct ScStreamEntry
struct ScCellStyleEntry
{
OUString maName;
- ScAddress const maCellPos;
+ ScAddress maCellPos;
ScCellStyleEntry( const OUString& rName, const ScAddress& rPos ) :
maName(rName),
@@ -76,9 +76,9 @@ struct ScNoteStyleEntry
struct ScTextStyleEntry
{
- OUString const maName;
- ScAddress const maCellPos;
- ESelection const maSelection;
+ OUString maName;
+ ScAddress maCellPos;
+ ESelection maSelection;
ScTextStyleEntry( const OUString& rName, const ScAddress& rPos, const ESelection& rSel ) :
maName(rName),
@@ -90,9 +90,9 @@ struct ScTextStyleEntry
struct ScLoadedNamespaceEntry
{
- OUString const maPrefix;
- OUString const maName;
- sal_uInt16 const mnKey;
+ OUString maPrefix;
+ OUString maName;
+ sal_uInt16 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 b75ab892340e..39a26d02cbed 100644
--- a/sc/inc/simpleformulacalc.hxx
+++ b/sc/inc/simpleformulacalc.hxx
@@ -26,14 +26,14 @@ private:
bool mbCalculated;
std::unique_ptr<ScTokenArray> mpCode;
- ScAddress const maAddr;
+ ScAddress maAddr;
ScDocument* mpDoc;
ScFormulaResult maResult;
- formula::FormulaGrammar::Grammar const maGram;
+ formula::FormulaGrammar::Grammar maGram;
bool mbMatrixResult;
OUString maMatrixFormulaResult;
bool mbLimitString;
- bool const mbMatrixFormula;
+ bool mbMatrixFormula;
public:
ScSimpleFormulaCalculator(ScDocument* pDoc, const ScAddress& rAddr,
diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx
index 378d6d4f4ff4..1cd5fdfe779e 100644
--- a/sc/inc/srchuno.hxx
+++ b/sc/inc/srchuno.hxx
@@ -36,7 +36,7 @@ class ScCellSearchObj final : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet aPropSet;
std::unique_ptr<SvxSearchItem>
pSearchItem;
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 71f92fc91b81..c3ea89e618f3 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -108,7 +108,7 @@ class ScStyleFamilyObj : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- SfxStyleFamily const eFamily; // Family
+ SfxStyleFamily eFamily; // Family
ScStyleObj* GetObjectByIndex_Impl(sal_uInt32 nIndex);
ScStyleObj* GetObjectByName_Impl(const OUString& Name);
@@ -169,7 +169,7 @@ class ScStyleObj : public ::cppu::WeakImplHelper<
private:
const SfxItemPropertySet* pPropSet;
ScDocShell* pDocShell;
- SfxStyleFamily const eFamily; // Family
+ SfxStyleFamily eFamily; // Family
OUString aStyleName;
SfxStyleSheetBase* pStyle_cached;
diff --git a/sc/inc/tabbgcolor.hxx b/sc/inc/tabbgcolor.hxx
index 92aff763d481..872d81285201 100644
--- a/sc/inc/tabbgcolor.hxx
+++ b/sc/inc/tabbgcolor.hxx
@@ -27,7 +27,7 @@
struct ScUndoTabColorInfo
{
- SCTAB const mnTabId;
+ SCTAB mnTabId;
Color maOldTabBgColor;
Color maNewTabBgColor;
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index 5550b71bdbdd..924b70856c71 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -81,7 +81,7 @@ class ScLinkTargetTypeObj final : public ::cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- sal_uInt16 const nType;
+ sal_uInt16 nType;
OUString aName;
public:
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 44445c8d7527..f7023ff36835 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -105,7 +105,7 @@ class ScHeaderFooterTextData
private:
std::unique_ptr<EditTextObject> mpTextObj;
css::uno::WeakReference<css::sheet::XHeaderFooterContent> xContentObj;
- ScHeaderFooterPart const nPart;
+ ScHeaderFooterPart nPart;
std::unique_ptr<ScEditEngineDefaulter> pEditEngine;
std::unique_ptr<SvxEditEngineForwarder> pForwarder;
bool bDataValid;
@@ -328,7 +328,7 @@ class ScCellTextData : public SfxListener
{
protected:
ScDocShell* pDocShell;
- ScAddress const aCellPos;
+ ScAddress 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 433a5e33ab74..68870e962dca 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -94,7 +94,7 @@ public:
class ScMatrixToken final : public formula::FormulaToken
{
private:
- ScMatrixRef const pMatrix;
+ ScMatrixRef pMatrix;
public:
ScMatrixToken( const ScMatrixRef& p );
ScMatrixToken( const ScMatrixToken& );
@@ -112,7 +112,7 @@ public:
*/
class ScMatrixRangeToken final : public formula::FormulaToken
{
- ScMatrixRef const mpMatrix;
+ ScMatrixRef mpMatrix;
ScComplexRefData maRef;
public:
ScMatrixRangeToken( const sc::RangeMatrix& rMat );
@@ -129,8 +129,8 @@ public:
class ScExternalSingleRefToken final : public formula::FormulaToken
{
- sal_uInt16 const mnFileId;
- svl::SharedString const maTabName;
+ sal_uInt16 mnFileId;
+ svl::SharedString maTabName;
ScSingleRefData maSingleRef;
public:
@@ -153,8 +153,8 @@ public:
class ScExternalDoubleRefToken final : public formula::FormulaToken
{
- sal_uInt16 const mnFileId;
- svl::SharedString const maTabName; // name of the first sheet
+ sal_uInt16 mnFileId;
+ svl::SharedString maTabName; // name of the first sheet
ScComplexRefData maDoubleRef;
public:
@@ -181,8 +181,8 @@ public:
class ScExternalNameToken final : public formula::FormulaToken
{
- sal_uInt16 const mnFileId;
- svl::SharedString const maName;
+ sal_uInt16 mnFileId;
+ svl::SharedString maName;
public:
ScExternalNameToken() = delete;
@@ -261,7 +261,7 @@ class ScRefListToken final : public formula::FormulaToken
{
private:
ScRefList aRefList;
- bool const mbArrayResult; // whether RefList is an array result
+ bool mbArrayResult; // whether RefList is an array result
public:
ScRefListToken() :
FormulaToken( formula::svRefList ), mbArrayResult(false) {}
@@ -276,8 +276,8 @@ public:
class ScEmptyCellToken final : public formula::FormulaToken
{
- bool const bInherited :1;
- bool const bDisplayedAsString :1;
+ bool bInherited :1;
+ bool bDisplayedAsString :1;
public:
explicit ScEmptyCellToken( bool bInheritedP, bool bDisplayAsString ) :
FormulaToken( formula::svEmptyCell ),
@@ -379,10 +379,10 @@ private:
class ScHybridCellToken final : public formula::FormulaToken
{
private:
- double const mfDouble;
- svl::SharedString const maString;
- OUString const maFormula;
- bool const mbEmptyDisplayedAsString;
+ double mfDouble;
+ svl::SharedString maString;
+ OUString maFormula;
+ bool 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 69cbdfb1502f..c33f6daf6b97 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 const meGram;
+ formula::FormulaGrammar::Grammar meGram;
formula::FormulaCompiler::OpCodeMapPtr mxOpCodeMap;
const ScCompiler::Convention* mpRefConv;
OUString maErrRef;
@@ -48,7 +48,7 @@ struct SC_DLLPUBLIC TokenStringContext
class SC_DLLPUBLIC CompileFormulaContext
{
- ScDocument* const mpDoc;
+ ScDocument* mpDoc;
formula::FormulaGrammar::Grammar meGram;
std::vector<OUString> maTabNames;
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index 5b82478c3385..56414f10c267 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -64,8 +64,8 @@ private:
class FindTypedStrData
{
- ScTypedStrData const maVal;
- bool const mbCaseSens;
+ ScTypedStrData maVal;
+ bool 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 53df4ee63c0a..3576c5449dd3 100644
--- a/sc/inc/undorangename.hxx
+++ b/sc/inc/undorangename.hxx
@@ -59,7 +59,7 @@ public:
private:
std::unique_ptr<ScRangeData> mpRangeData;
- SCTAB const mnTab;
+ SCTAB mnTab;
};
#endif
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx
index 465aacf4eacd..c4baa1cf9764 100644
--- a/sc/inc/unitconv.hxx
+++ b/sc/inc/unitconv.hxx
@@ -26,8 +26,8 @@
class ScUnitConverterData
{
- OUString const maIndexString;
- double const mfValue;
+ OUString maIndexString;
+ double mfValue;
public:
ScUnitConverterData( const OUString& rFromUnit,
diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx
index 3fd70825f070..b3fad4de1b50 100644
--- a/sc/inc/unoreflist.hxx
+++ b/sc/inc/unoreflist.hxx
@@ -26,8 +26,8 @@
struct ScUnoRefEntry
{
- sal_Int64 const nObjectId;
- ScRangeList const aRanges;
+ sal_Int64 nObjectId;
+ ScRangeList aRanges;
ScUnoRefEntry( sal_Int64 nId, const ScRangeList& rOldRanges ) :
nObjectId( nId ),
@@ -59,7 +59,7 @@ public:
class ScUnoRefUndoHint final : public SfxHint
{
- ScUnoRefEntry const aEntry;
+ ScUnoRefEntry aEntry;
public:
ScUnoRefUndoHint( const ScUnoRefEntry& rRefEntry );
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 2852849b0f14..d4e92bd9ce4e 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -62,7 +62,7 @@ class SC_DLLPUBLIC ScValidationData final : public ScConditionEntry
private:
sal_uInt32 nKey; // index in attributes
- ScValidationMode const eDataMode;
+ ScValidationMode eDataMode;
bool bShowInput;
bool bShowError;
ScValidErrorStyle eErrorStyle;
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 75484cd7e109..f077b4090a22 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -128,7 +128,7 @@ public:
const ScViewOptions& GetViewOptions() const { return theOptions; }
private:
- ScViewOptions const theOptions;
+ ScViewOptions theOptions;
};
// CfgItem for View options
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 65af81246c8e..03b21d4835cf 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -63,7 +63,7 @@ class ScViewPaneBase : public css::sheet::XViewPane,
{
private:
ScTabViewShell* pViewShell;
- sal_uInt16 const nPane; // ScSplitPos or SC_VIEWPANE_ACTIVE
+ sal_uInt16 nPane; // ScSplitPos or SC_VIEWPANE_ACTIVE
protected:
css::awt::Rectangle GetVisArea() const;
@@ -149,7 +149,7 @@ private:
typedef std::vector<css::uno::Reference<css::awt::XEnhancedMouseClickHandler> > XMouseClickHandlerVector;
typedef std::vector<css::uno::Reference<css::sheet::XActivationEventListener> > XActivationEventListenerVector;
- SfxItemPropertySet const aPropSet;
+ SfxItemPropertySet 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 cadcf0050d8b..cbd2b9bd09e5 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -149,11 +149,11 @@ public:
}
private:
- ScDocument* const mpDoc;
+ ScDocument* mpDoc;
SCCOL mnCol;
SCROW mnRow;
- SCTAB const mnTab;
- StringType const meStringType;
+ SCTAB mnTab;
+ StringType meStringType;
};
class conditional_format_handler
@@ -194,10 +194,10 @@ public:
}
private:
- ScDocument* const mpDoc;
+ ScDocument* mpDoc;
SCCOL mnCol;
SCROW mnRow;
- SCTAB const mnTab;
+ SCTAB mnTab;
};
#endif
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 4cf5ddea1a40..1a721287418f 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -73,12 +73,12 @@ struct TestParam
{
struct RowData
{
- 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;
+ 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;
};
const char* sTestDoc;
int nImportType;
@@ -165,7 +165,7 @@ class SCQAHELPER_DLLPUBLIC ScBootstrapFixture : public test::BootstrapFixture
{
static const FileFormat aFileFormats[];
protected:
- OUString const m_aBaseString;
+ OUString 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 1b62cc1eecb4..9b6f41a3e284 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -505,8 +505,8 @@ void Test::testRowForHeight()
struct Check
{
- sal_uLong const nHeight;
- SCROW const nRow;
+ sal_uLong nHeight;
+ SCROW nRow;
};
std::vector<Check> aChecks = {
@@ -604,8 +604,8 @@ void Test::testSelectionFunction()
struct Check
{
- ScSubTotalFunc const meFunc;
- double const mfExpected;
+ ScSubTotalFunc meFunc;
+ double mfExpected;
};
{
@@ -3613,8 +3613,8 @@ void Test::testCopyPasteSkipEmpty()
struct Check
{
const char* mpStr;
- Color const maColor;
- bool const mbHasNote;
+ Color maColor;
+ bool mbHasNote;
};
struct TestRange
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 45790021e943..ad04681d61f0 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -26,7 +26,7 @@ class ScUndoCut;
class FormulaGrammarSwitch
{
ScDocument* mpDoc;
- formula::FormulaGrammar::Grammar const meOldGrammar;
+ formula::FormulaGrammar::Grammar 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 db096184f52b..97dfa38030c9 100644
--- a/sc/qa/unit/ucalc_column.cxx
+++ b/sc/qa/unit/ucalc_column.cxx
@@ -101,8 +101,8 @@ void Test::testSetFormula()
static struct aInputs
{
- SCROW const nRow;
- SCCOL const nCol;
+ SCROW nRow;
+ SCCOL 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 const eGram;
diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
index ed1b0fcc00b8..24b091603b63 100644
--- a/sc/qa/unit/ucalc_condformat.cxx
+++ b/sc/qa/unit/ucalc_condformat.cxx
@@ -591,8 +591,8 @@ namespace {
struct ScDataBarLengthData
{
- double const nVal;
- double const nLength;
+ double nVal;
+ double nLength;
};
void testDataBarLengthImpl(ScDocument* pDoc, const ScDataBarLengthData* pData, const ScRange& rRange,
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 17e8bde4fc53..f9babfa4772d 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -137,11 +137,11 @@ void Test::testFormulaCreateStringFromTokens()
// Insert DB ranges.
static const struct {
const char* pName;
- SCTAB const nTab;
- SCCOL const nCol1;
- SCROW const nRow1;
- SCCOL const nCol2;
- SCROW const nRow2;
+ SCTAB nTab;
+ SCCOL nCol1;
+ SCROW nRow1;
+ SCCOL nCol2;
+ SCROW nRow2;
} aDBs[] = {
{ "Table1", 0, 0, 0, 10, 10 },
{ "Table2", 1, 0, 0, 10, 10 },
@@ -859,7 +859,7 @@ void Test::testFormulaHashAndTag()
static const struct {
const char* pFormula;
- ScFormulaVectorState const eState;
+ ScFormulaVectorState eState;
} aVectorTests[] = {
{ "=SUM(1;2;3;4;5)", FormulaVectorEnabled },
{ "=NOW()", FormulaVectorDisabled },
@@ -893,7 +893,7 @@ void Test::testFormulaTokenEquality()
{
const char* mpFormula1;
const char* mpFormula2;
- bool const mbEqual;
+ bool mbEqual;
};
static const FormulaTokenEqualityTest aTests[] = {
@@ -1009,8 +1009,8 @@ void Test::testFormulaCompilerJumpReordering()
{
struct TokenCheck
{
- OpCode const meOp;
- StackVar const meType;
+ OpCode meOp;
+ StackVar meType;
};
// Set separators first.
@@ -1085,11 +1085,11 @@ void Test::testFormulaCompilerImplicitIntersection2Param()
{
struct TestCaseFormula
{
- OUString const aFormula;
- ScAddress const aCellAddress;
- ScRange const aSumRange;
- bool const bStartColRel; // SumRange-StartCol
- bool const bEndColRel; // SumRange-EndCol
+ OUString aFormula;
+ ScAddress aCellAddress;
+ ScRange aSumRange;
+ bool bStartColRel; // SumRange-StartCol
+ bool bEndColRel; // SumRange-EndCol
};
m_pDoc->InsertTab(0, "Formula");
@@ -1211,10 +1211,10 @@ void Test::testFormulaCompilerImplicitIntersection1ParamNoChange()
{
struct TestCaseFormulaNoChange
{
- OUString const aFormula;
- ScAddress const aCellAddress;
- bool const bMatrixFormula;
- bool const bForcedArray;
+ OUString aFormula;
+ ScAddress aCellAddress;
+ bool bMatrixFormula;
+ bool bForcedArray;
};
m_pDoc->InsertTab(0, "Formula");
@@ -1308,9 +1308,9 @@ void Test::testFormulaCompilerImplicitIntersection1ParamWithChange()
{
struct TestCaseFormula
{
- OUString const aFormula;
- ScAddress const aCellAddress;
- ScAddress const aArgAddr;
+ OUString aFormula;
+ ScAddress aCellAddress;
+ ScAddress aArgAddr;
};
m_pDoc->InsertTab(0, "Formula");
@@ -1406,8 +1406,8 @@ void Test::testFormulaCompilerImplicitIntersectionOperators()
{
struct TestCase
{
- OUString const formula[3];
- double const result[3];
+ OUString formula[3];
+ double result[3];
};
m_pDoc->InsertTab(0, "Test");
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 905a26ec0143..e8327f65c0f5 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -37,14 +37,14 @@ namespace {
struct DPFieldDef
{
const char* pName;
- sheet::DataPilotFieldOrientation const eOrient;
+ sheet::DataPilotFieldOrientation eOrient;
/**
* Function for data field. It's used only for data field. When 0, the
* default function (SUM) is used.
*/
- ScGeneralFunction const eFunc;
- bool const bRepeatItemLabels;
+ ScGeneralFunction eFunc;
+ bool bRepeatItemLabels;
};
template<size_t Size>
@@ -2264,7 +2264,7 @@ void Test::testFuncGETPIVOTDATALeafAccess()
struct Check
{
const char* mpFormula;
- double const mfResult;
+ double mfResult;
};
static const Check aChecks[] = {
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index efa1ac103e1e..c3a92bf7d187 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -57,10 +57,10 @@ namespace {
struct ScSlotData
{
- SCROW const nStartRow; // first row of this segment
- SCROW const nStopRow; // first row of next segment
- SCSIZE const nSlice; // slice size in this segment
- SCSIZE const nCumulated; // cumulated slots of previous segments
+ SCROW nStartRow; // first row of this segment
+ SCROW nStopRow; // first row of next segment
+ SCSIZE nSlice; // slice size in this segment
+ SCSIZE nCumulated; // cumulated slots of previous segments
ScSlotData( SCROW r1, SCROW r2, SCSIZE s, SCSIZE c ) : nStartRow(r1), nStopRow(r2), nSlice(s), nCumulated(c) {}
};
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 2fc667a17b74..693da4ae62f2 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1322,7 +1322,7 @@ const OUStringLiteral a5Ratings[] = {
};
struct ScIconSetBitmapMap {
- ScIconSetType const eType;
+ ScIconSetType eType;
const OUStringLiteral* pBitmaps;
};
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 36432e9f3358..7fa1c4c30286 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1258,7 +1258,7 @@ class CopyAsLinkHandler
ScColumn& mrDestCol;
sc::ColumnBlockPosition maDestPos;
sc::ColumnBlockPosition* mpDestPos;
- InsertDeleteFlags const mnCopyFlags;
+ InsertDeleteFlags mnCopyFlags;
sc::StartListeningType meListenType;
@@ -1394,10 +1394,10 @@ class CopyByCloneHandler
sc::ColumnBlockPosition maDestPos;
sc::ColumnBlockPosition* mpDestPos;
svl::SharedStringPool* mpSharedStringPool;
- InsertDeleteFlags const mnCopyFlags;
+ InsertDeleteFlags mnCopyFlags;
sc::StartListeningType meListenType;
- ScCloneFlags const mnFormulaCellCloneFlags;
+ ScCloneFlags mnFormulaCellCloneFlags;
void setDefaultAttrToDest(size_t nRow)
{
@@ -1890,8 +1890,8 @@ void resetColumnPosition(sc::CellStoreType& rCells, SCCOL nCol)
class NoteCaptionUpdater
{
- SCCOL const mnCol;
- SCTAB const mnTab;
+ SCCOL mnCol;
+ SCTAB mnTab;
public:
NoteCaptionUpdater( SCCOL nCol, SCTAB nTab ) : mnCol(nCol), mnTab(nTab) {}
@@ -2092,7 +2092,7 @@ public:
class UpdateRefOnCopy
{
const sc::RefUpdateContext& mrCxt;
- ScDocument* const mpUndoDoc;
+ ScDocument* mpUndoDoc;
bool mbUpdated;
public:
@@ -2538,9 +2538,9 @@ class UpdateTransHandler
{
ScColumn& mrColumn;
sc::CellStoreType::iterator miPos;
- ScRange const maSource;
- ScAddress const maDest;
- ScDocument* const mpUndoDoc;
+ ScRange maSource;
+ ScAddress maDest;
+ ScDocument* mpUndoDoc;
public:
UpdateTransHandler(ScColumn& rColumn, const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc) :
mrColumn(rColumn),
@@ -2561,9 +2561,9 @@ class UpdateGrowHandler
{
ScColumn& mrColumn;
sc::CellStoreType::iterator miPos;
- ScRange const maArea;
- SCCOL const mnGrowX;
- SCROW const mnGrowY;
+ ScRange maArea;
+ SCCOL mnGrowX;
+ SCROW mnGrowY;
public:
UpdateGrowHandler(ScColumn& rColumn, const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY) :
mrColumn(rColumn),
@@ -2585,7 +2585,7 @@ class InsertTabUpdater
sc::RefUpdateInsertTabContext& mrCxt;
sc::CellTextAttrStoreType& mrTextAttrs;
sc::CellTextAttrStoreType::iterator miAttrPos;
- SCTAB const mnTab;
+ SCTAB mnTab;
bool mbModified;
public:
@@ -2618,7 +2618,7 @@ class DeleteTabUpdater
sc::RefUpdateDeleteTabContext& mrCxt;
sc::CellTextAttrStoreType& mrTextAttrs;
sc::CellTextAttrStoreType::iterator miAttrPos;
- SCTAB const mnTab;
+ SCTAB mnTab;
bool mbModified;
public:
DeleteTabUpdater(sc::RefUpdateDeleteTabContext& rCxt, sc::CellTextAttrStoreType& rTextAttrs, SCTAB nTab) :
@@ -2649,8 +2649,8 @@ class InsertAbsTabUpdater
{
sc::CellTextAttrStoreType& mrTextAttrs;
sc::CellTextAttrStoreType::iterator miAttrPos;
- SCTAB const mnTab;
- SCTAB const mnNewPos;
+ SCTAB mnTab;
+ SCTAB mnNewPos;
bool mbModified;
public:
InsertAbsTabUpdater(sc::CellTextAttrStoreType& rTextAttrs, SCTAB nTab, SCTAB nNewPos) :
@@ -2682,7 +2682,7 @@ class MoveTabUpdater
sc::RefUpdateMoveTabContext& mrCxt;
sc::CellTextAttrStoreType& mrTextAttrs;
sc::CellTextAttrStoreType::iterator miAttrPos;
- SCTAB const mnTab;
+ SCTAB mnTab;
bool mbModified;
public:
MoveTabUpdater(sc::RefUpdateMoveTabContext& rCxt, sc::CellTextAttrStoreType& rTextAttrs, SCTAB nTab) :
@@ -2711,7 +2711,7 @@ public:
class UpdateCompileHandler
{
- bool const mbForceIfNameInUse:1;
+ bool mbForceIfNameInUse:1;
public:
explicit UpdateCompileHandler(bool bForceIfNameInUse) :
mbForceIfNameInUse(bForceIfNameInUse) {}
@@ -2724,7 +2724,7 @@ public:
class TabNoSetter
{
- SCTAB const mnTab;
+ SCTAB mnTab;
public:
explicit TabNoSetter(SCTAB nTab) : mnTab(nTab) {}
@@ -2985,7 +2985,7 @@ class CompileErrorCellsHandler
sc::CompileFormulaContext& mrCxt;
ScColumn& mrColumn;
sc::CellStoreType::iterator miPos;
- FormulaError const mnErrCode;
+ FormulaError mnErrCode;
bool mbCompiled;
public:
CompileErrorCellsHandler( sc::CompileFormulaContext& rCxt, ScColumn& rColumn, FormulaError nErrCode ) :
@@ -3025,7 +3025,7 @@ public:
class CalcAfterLoadHandler
{
sc::CompileFormulaContext& mrCxt;
- bool const mbStartListening;
+ bool mbStartListening;
public:
CalcAfterLoadHandler( sc::CompileFormulaContext& rCxt, bool bStartListening ) :
@@ -3052,7 +3052,7 @@ class FindEditCellsHandler
{
ScColumn& mrColumn;
sc::CellTextAttrStoreType::iterator miAttrPos;
- sc::CellStoreType::iterator const miCellPos;
+ sc::CellStoreType::iterator miCellPos;
public:
explicit FindEditCellsHandler(ScColumn& rCol) :
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index f00da7667514..6d19daf40fa5 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -575,7 +575,7 @@ namespace {
class MaxStrLenFinder
{
ScDocument& mrDoc;
- sal_uInt32 const mnFormat;
+ sal_uInt32 mnFormat;
OUString maMaxLenStr;
sal_Int32 mnMaxLen;
@@ -1034,8 +1034,8 @@ class StrEntries
protected:
struct StrEntry
{
- SCROW const mnRow;
- OUString const maStr;
+ SCROW mnRow;
+ OUString maStr;
StrEntry(SCROW nRow, const OUString& rStr) : mnRow(nRow), maStr(rStr) {}
};
@@ -1118,7 +1118,7 @@ public:
class TestTabRefAbsHandler
{
- SCTAB const mnTab;
+ SCTAB mnTab;
bool mbTestResult;
public:
explicit TestTabRefAbsHandler(SCTAB nTab) : mnTab(nTab), mbTestResult(false) {}
@@ -1797,12 +1797,12 @@ class CopyCellNotesHandler
ScColumn& mrDestCol;
sc::CellNoteStoreType& mrDestNotes;
sc::CellNoteStoreType::iterator miPos;
- SCTAB const mnSrcTab;
- SCCOL const mnSrcCol;
- SCTAB const mnDestTab;
- SCCOL const mnDestCol;
- SCROW const mnDestOffset; /// Add this to the source row position to get the destination row.
- bool const mbCloneCaption;
+ SCTAB mnSrcTab;
+ SCCOL mnSrcCol;
+ SCTAB mnDestTab;
+ SCCOL mnDestCol;
+ SCROW mnDestOffset; /// Add this to the source row position to get the destination row.
+ bool mbCloneCaption;
public:
CopyCellNotesHandler( const ScColumn& rSrcCol, ScColumn& rDestCol, SCROW nDestOffset, bool bCloneCaption ) :
@@ -2160,9 +2160,9 @@ namespace {
class ToMatrixHandler
{
ScMatrix& mrMat;
- SCCOL const mnMatCol;
- SCROW const mnTopRow;
- ScDocument* const mpDoc;
+ SCCOL mnMatCol;
+ SCROW mnTopRow;
+ ScDocument* mpDoc;
svl::SharedStringPool& mrStrPool;
public:
ToMatrixHandler(ScMatrix& rMat, SCCOL nMatCol, SCROW nTopRow, ScDocument* pDoc) :
@@ -2253,10 +2253,10 @@ struct CellBucket
class FillMatrixHandler
{
ScMatrix& mrMat;
- size_t const mnMatCol;
- size_t const mnTopRow;
+ size_t mnMatCol;
+ size_t mnTopRow;
- ScDocument* const mpDoc;
+ ScDocument* mpDoc;
svl::SharedStringPool& mrPool;
svl::SharedStringPool* mpPool; // if matrix is not in the same document
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 29eb7d51a90f..2f3869db93c0 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -373,7 +373,7 @@ public:
class DetachFormulaCellsHandler
{
- ScDocument* const mpDoc;
+ ScDocument* mpDoc;
sc::EndListeningContext* mpCxt;
public:
@@ -799,10 +799,10 @@ class DeleteAreaHandler
std::vector<ScFormulaCell*> maFormulaCells;
sc::SingleColumnSpanSet maDeleteRanges;
- bool const mbNumeric:1;
- bool const mbString:1;
- bool const mbFormula:1;
- bool const mbDateTime:1;
+ bool mbNumeric:1;
+ bool mbString:1;
+ bool mbFormula:1;
+ bool mbDateTime:1;
ScColumn& mrCol;
public:
@@ -1053,7 +1053,7 @@ class CopyAttrArrayByRange
{
ScAttrArray& mrDestAttrArray;
ScAttrArray& mrSrcAttrArray;
- long const mnRowOffset;
+ long mnRowOffset;
public:
CopyAttrArrayByRange(ScAttrArray& rDestAttrArray, ScAttrArray& rSrcAttrArray, long nRowOffset) :
mrDestAttrArray(rDestAttrArray), mrSrcAttrArray(rSrcAttrArray), mnRowOffset(nRowOffset) {}
@@ -1070,11 +1070,11 @@ class CopyCellsFromClipHandler
sc::CopyFromClipContext& mrCxt;
ScColumn& mrSrcCol;
ScColumn& mrDestCol;
- SCTAB const mnTab;
- SCCOL const mnCol;
- SCTAB const mnSrcTab;
- SCCOL const mnSrcCol;
- long const mnRowOffset;
+ SCTAB mnTab;
+ SCCOL mnCol;
+ SCTAB mnSrcTab;
+ SCCOL mnSrcCol;
+ long mnRowOffset;
sc::ColumnBlockPosition maDestBlockPos;
sc::ColumnBlockPosition* mpDestBlockPos; // to save it for next iteration.
svl::SharedStringPool* mpSharedStringPool;
@@ -1335,7 +1335,7 @@ public:
class CopyTextAttrsFromClipHandler
{
sc::CellTextAttrStoreType& mrAttrs;
- size_t const mnDelta;
+ size_t mnDelta;
sc::ColumnBlockPosition maDestBlockPos;
sc::ColumnBlockPosition* mpDestBlockPos; // to save it for next iteration.
@@ -1519,10 +1519,10 @@ class MixDataHandler
sc::CellStoreType maNewCells;
sc::CellStoreType::iterator miNewCellsPos;
- size_t const mnRowOffset;
- ScPasteFunc const mnFunction;
+ size_t mnRowOffset;
+ ScPasteFunc mnFunction;
- bool const mbSkipEmpty;
+ bool mbSkipEmpty;
void doFunction( size_t nDestRow, double fVal1, double fVal2 )
{
@@ -1896,7 +1896,7 @@ namespace {
class StartListenersHandler
{
sc::StartListeningContext* mpCxt;
- bool const mbAllListeners;
+ bool mbAllListeners;
public:
StartListenersHandler( sc::StartListeningContext& rCxt, bool bAllListeners ) :
@@ -2531,8 +2531,8 @@ class StrCellIterator
{
typedef std::pair<sc::CellStoreType::const_iterator,size_t> PosType;
PosType maPos;
- sc::CellStoreType::const_iterator const miBeg;
- sc::CellStoreType::const_iterator const miEnd;
+ sc::CellStoreType::const_iterator miBeg;
+ sc::CellStoreType::const_iterator miEnd;
const ScDocument* mpDoc;
public:
StrCellIterator(const sc::CellStoreType& rCells, SCROW nStart, const ScDocument* pDoc) :
@@ -3129,8 +3129,8 @@ class MaxStringLenHandler
sal_Int32 mnMaxLen;
const ScColumn& mrColumn;
SvNumberFormatter* mpFormatter;
- rtl_TextEncoding const meCharSet;
- bool const mbOctetEncoding;
+ rtl_TextEncoding meCharSet;
+ bool mbOctetEncoding;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list