include/test/bootstrapfixture.hxx | 4 -
include/test/container/xelementaccess.hxx | 2
include/test/container/xindexaccess.hxx | 2
include/test/container/xnamecontainer.hxx | 2
include/test/container/xnamed.hxx | 2
include/test/container/xnamereplace.hxx | 2
include/test/sheet/xformulaquery.hxx | 8 +--
include/test/sheet/xnamedranges.hxx | 2
include/test/sheet/xspreadsheetdocument.hxx | 2
include/test/unoapi_test.hxx | 2
include/test/util/xreplaceable.hxx | 4 -
include/test/util/xsearchable.hxx | 4 -
sw/inc/EnhancedPDFExportHelper.hxx | 4 -
sw/inc/SwUndoField.hxx | 6 +-
sw/inc/ToxLinkProcessor.hxx | 8 +--
sw/inc/ToxTabStopTokenHandler.hxx | 6 +-
sw/inc/accmap.hxx | 2
sw/inc/acmplwrd.hxx | 2
sw/inc/calc.hxx | 2
sw/inc/ccoll.hxx | 4 -
sw/inc/crstate.hxx | 2
sw/inc/ddefld.hxx | 2
sw/inc/docufld.hxx | 6 +-
sw/inc/editsh.hxx | 2
sw/inc/expfld.hxx | 6 +-
sw/inc/fldbas.hxx | 2
sw/inc/fmtfld.hxx | 2
sw/inc/fmthdft.hxx | 4 -
sw/inc/frmfmt.hxx | 2
sw/inc/gotodlg.hxx | 2
sw/inc/grfatr.hxx | 2
sw/inc/hhcwrp.hxx | 2
sw/inc/hints.hxx | 28 ++++++------
sw/inc/htmltbl.hxx | 36 ++++++++--------
sw/inc/modcfg.hxx | 2
sw/inc/modeltoviewhelper.hxx | 6 +-
sw/inc/node.hxx | 6 +-
sw/inc/pagedesc.hxx | 2
sw/inc/prtopt.hxx | 2
sw/inc/redline.hxx | 4 -
sw/inc/shellio.hxx | 16 +++----
sw/inc/shellres.hxx | 50 +++++++++++-----------
sw/inc/splargs.hxx | 6 +-
sw/inc/swatrset.hxx | 2
sw/inc/swcli.hxx | 2
sw/inc/swscanner.hxx | 6 +-
sw/inc/tblsel.hxx | 8 +--
sw/inc/tox.hxx | 6 +-
sw/inc/txatritr.hxx | 2
sw/inc/undobj.hxx | 4 -
sw/inc/unochart.hxx | 4 -
sw/inc/unosett.hxx | 2
sw/inc/unostyle.hxx | 10 ++--
sw/inc/unotxdoc.hxx | 6 +-
sw/source/core/access/acccontext.hxx | 2
sw/source/core/access/accfrmobjmap.hxx | 6 +-
sw/source/core/access/acchyperlink.hxx | 4 -
sw/source/core/access/accmap.cxx | 6 +-
sw/source/core/access/accpara.cxx | 2
sw/source/core/access/acctable.cxx | 4 -
sw/source/core/crsr/crbm.cxx | 2
sw/source/core/crsr/findattr.cxx | 6 +-
sw/source/core/crsr/findtxt.cxx | 4 -
sw/source/core/crsr/swcrsr.cxx | 2
sw/source/core/doc/CntntIdxStore.cxx | 4 -
sw/source/core/doc/DocumentStylePoolManager.cxx | 8 +--
sw/source/core/doc/doccomp.cxx | 2
sw/source/core/doc/docedt.cxx | 4 -
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/doc/htmltbl.cxx | 6 +-
sw/source/core/doc/tblrwcl.cxx | 2
sw/source/core/docnode/ndcopy.cxx | 4 -
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/docnode/ndtbl1.cxx | 2
sw/source/core/docnode/node2lay.cxx | 2
sw/source/core/docnode/threadmanager.hxx | 2
sw/source/core/draw/dcontact.cxx | 4 -
sw/source/core/fields/reffld.cxx | 2
sw/source/core/inc/SwUndoFmt.hxx | 4 -
sw/source/core/inc/SwUndoPageDesc.hxx | 2
sw/source/core/inc/SwXMLBlockImport.hxx | 2
sw/source/core/inc/UndoCore.hxx | 2
sw/source/core/inc/UndoDelete.hxx | 4 -
sw/source/core/inc/UndoDraw.hxx | 2
sw/source/core/inc/UndoInsert.hxx | 20 ++++----
sw/source/core/inc/UndoNumbering.hxx | 18 ++++----
sw/source/core/inc/UndoOverwrite.hxx | 2
sw/source/core/inc/UndoRedline.hxx | 4 -
sw/source/core/inc/UndoSplitMove.hxx | 4 -
sw/source/core/inc/UndoTable.hxx | 34 +++++++--------
sw/source/core/inc/acorrect.hxx | 12 ++---
sw/source/core/inc/blink.hxx | 2
sw/source/core/inc/docsort.hxx | 4 -
sw/source/core/inc/fieldhint.hxx | 4 -
sw/source/core/inc/fntcache.hxx | 2
sw/source/core/inc/frmtool.hxx | 4 -
sw/source/core/inc/mvsave.hxx | 14 +++---
sw/source/core/inc/pagedeschint.hxx | 2
sw/source/core/inc/rolbck.hxx | 4 -
sw/source/core/inc/rootfrm.hxx | 2
sw/source/core/inc/scriptinfo.hxx | 4 -
sw/source/core/inc/swblocks.hxx | 6 +-
sw/source/core/inc/swfntcch.hxx | 2
sw/source/core/inc/swfont.hxx | 2
sw/source/core/inc/tblrwcl.hxx | 4 -
sw/source/core/inc/txmsrt.hxx | 24 +++++-----
sw/source/core/inc/txtfrm.hxx | 4 -
sw/source/core/inc/unobookmark.hxx | 2
sw/source/core/inc/unoflatpara.hxx | 2
sw/source/core/layout/dbg_lay.cxx | 6 +-
sw/source/core/layout/layhelp.hxx | 14 +++---
sw/source/core/layout/layouter.cxx | 2
sw/source/core/layout/objectformattertxtfrm.hxx | 2
sw/source/core/layout/paintfrm.cxx | 10 ++--
sw/source/core/text/itrtxt.hxx | 2
sw/source/core/text/pordrop.hxx | 4 -
sw/source/core/text/porexp.hxx | 4 -
sw/source/core/text/porfld.hxx | 4 -
sw/source/core/text/porftn.hxx | 2
sw/source/core/text/porhyph.hxx | 2
sw/source/core/text/pormulti.hxx | 2
sw/source/core/text/porrst.hxx | 12 ++---
sw/source/core/text/txtdrop.cxx | 8 +--
sw/source/core/text/txtfly.cxx | 2
sw/source/core/text/xmldump.cxx | 2
sw/source/core/tox/tox.cxx | 4 -
sw/source/core/txtnode/fntcache.cxx | 6 +-
sw/source/core/txtnode/modeltoviewhelper.cxx | 8 +--
sw/source/core/undo/unins.cxx | 4 -
sw/source/core/undo/unovwr.cxx | 2
sw/source/core/undo/untbl.cxx | 10 ++--
sw/source/core/unocore/unocoll.cxx | 6 +-
sw/source/core/unocore/unodraw.cxx | 2
sw/source/core/unocore/unofield.cxx | 8 +--
sw/source/core/unocore/unoidx.cxx | 2
sw/source/core/unocore/unoparagraph.cxx | 4 -
sw/source/core/unocore/unoportenum.cxx | 2
sw/source/core/unocore/unostyle.cxx | 28 ++++++------
sw/source/core/unocore/unotext.cxx | 4 -
sw/source/core/view/vprint.cxx | 2
sw/source/filter/ascii/parasc.cxx | 2
sw/source/filter/basflt/fltini.cxx | 2
sw/source/filter/html/css1atr.cxx | 2
sw/source/filter/html/htmlatr.cxx | 4 -
sw/source/filter/html/htmlfld.cxx | 2
sw/source/filter/html/htmlfly.hxx | 4 -
sw/source/filter/html/htmlform.cxx | 8 +--
sw/source/filter/html/htmltab.cxx | 32 +++++++-------
sw/source/filter/html/parcss1.hxx | 4 -
sw/source/filter/html/svxcss1.hxx | 4 -
sw/source/filter/html/swcss1.hxx | 2
sw/source/filter/html/swhtml.hxx | 12 ++---
sw/source/filter/html/wrthtml.hxx | 10 ++--
sw/source/filter/inc/fltshell.hxx | 16 +++----
sw/source/filter/inc/msfilter.hxx | 2
sw/source/filter/inc/wrtswtbl.hxx | 30 ++++++-------
sw/source/filter/ww8/WW8TableInfo.hxx | 6 +-
sw/source/filter/ww8/attributeoutputbase.hxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 4 -
sw/source/filter/ww8/docxattributeoutput.hxx | 2
sw/source/filter/ww8/docxexport.hxx | 2
sw/source/filter/ww8/docxhelper.hxx | 2
sw/source/filter/ww8/rtfexport.hxx | 2
sw/source/filter/ww8/writerhelper.cxx | 4 -
sw/source/filter/ww8/writerwordglue.cxx | 2
sw/source/filter/ww8/wrtww8.hxx | 42 +++++++++---------
sw/source/filter/ww8/ww8glsy.hxx | 2
sw/source/filter/ww8/ww8graf.hxx | 2
sw/source/filter/ww8/ww8par.hxx | 54 ++++++++++++------------
sw/source/filter/xml/XMLRedlineImportHelper.hxx | 2
sw/source/filter/xml/xmlfmt.cxx | 4 -
sw/source/filter/xml/xmlitmap.hxx | 4 -
sw/source/filter/xml/xmlmeta.cxx | 2
sw/source/filter/xml/xmltble.cxx | 2
sw/source/filter/xml/xmltbli.cxx | 18 ++++----
sw/source/filter/xml/xmltexti.cxx | 4 -
sw/source/ui/config/optpage.cxx | 4 -
sw/source/ui/dbui/createaddresslistdialog.hxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 4 -
sw/source/ui/dbui/mmaddressblockpage.hxx | 6 +-
sw/source/ui/envelp/labelexp.cxx | 2
sw/source/ui/envelp/labfmt.hxx | 20 ++++----
sw/source/ui/frmdlg/cption.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 22 ++++-----
sw/source/ui/inc/mmresultdialogs.hxx | 4 -
sw/source/ui/misc/impfnote.hxx | 2
sw/source/ui/vba/vbaaddin.hxx | 2
sw/source/ui/vba/vbabookmark.hxx | 2
sw/source/ui/vba/vbaborders.cxx | 4 -
sw/source/ui/vba/vbacell.hxx | 4 -
sw/source/ui/vba/vbacells.cxx | 8 +--
sw/source/ui/vba/vbacells.hxx | 4 -
sw/source/ui/vba/vbacolumn.hxx | 2
sw/source/ui/vba/vbadialog.cxx | 2
sw/source/ui/vba/vbadocuments.cxx | 2
sw/source/ui/vba/vbafield.cxx | 2
sw/source/ui/vba/vbaheaderfooter.hxx | 4 -
sw/source/ui/vba/vbaheadersfooters.cxx | 2
sw/source/ui/vba/vbaheadersfooters.hxx | 2
sw/source/ui/vba/vbalistgallery.hxx | 2
sw/source/ui/vba/vbalisthelper.hxx | 4 -
sw/source/ui/vba/vbalistlevel.hxx | 2
sw/source/ui/vba/vbalistlevels.hxx | 2
sw/source/ui/vba/vbalisttemplates.hxx | 2
sw/source/ui/vba/vbarow.hxx | 2
sw/source/ui/vba/vbastyles.cxx | 6 +-
sw/source/ui/vba/vbatemplate.hxx | 2
sw/source/ui/vba/vbavariable.hxx | 2
sw/source/uibase/app/docst.cxx | 6 +-
sw/source/uibase/config/viewopt.cxx | 4 -
sw/source/uibase/dbui/maildispatcher.cxx | 2
sw/source/uibase/dochdl/gloshdl.cxx | 6 +-
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 12 ++---
sw/source/uibase/docvw/PostItMgr.cxx | 4 -
sw/source/uibase/docvw/ShadowOverlayObject.cxx | 6 +-
sw/source/uibase/docvw/edtwin.cxx | 2
sw/source/uibase/docvw/romenu.hxx | 44 +++++++++----------
sw/source/uibase/fldui/fldmgr.cxx | 10 ++--
sw/source/uibase/inc/DashedLine.hxx | 2
sw/source/uibase/inc/HeaderFooterWin.hxx | 2
sw/source/uibase/inc/break.hxx | 2
sw/source/uibase/inc/chrdlg.hxx | 2
sw/source/uibase/inc/colex.hxx | 2
sw/source/uibase/inc/content.hxx | 18 ++++----
sw/source/uibase/inc/conttree.hxx | 22 ++++-----
sw/source/uibase/inc/convert.hxx | 2
sw/source/uibase/inc/cption.hxx | 2
sw/source/uibase/inc/dbinsdlg.hxx | 2
sw/source/uibase/inc/drpcps.hxx | 4 -
sw/source/uibase/inc/fldmgr.hxx | 18 ++++----
sw/source/uibase/inc/frmdlg.hxx | 6 +-
sw/source/uibase/inc/gloshdl.hxx | 2
sw/source/uibase/inc/hyp.hxx | 2
sw/source/uibase/inc/insfnote.hxx | 2
sw/source/uibase/inc/label.hxx | 4 -
sw/source/uibase/inc/labimg.hxx | 2
sw/source/uibase/inc/mailmergehelper.hxx | 18 ++++----
sw/source/uibase/inc/mailmergewizard.hxx | 14 +++---
sw/source/uibase/inc/olmenu.hxx | 28 ++++++------
sw/source/uibase/inc/optload.hxx | 20 ++++----
sw/source/uibase/inc/optpage.hxx | 10 ++--
sw/source/uibase/inc/outline.hxx | 4 -
sw/source/uibase/inc/pview.hxx | 2
sw/source/uibase/inc/redlndlg.hxx | 14 +++---
sw/source/uibase/inc/scroll.hxx | 10 ++--
sw/source/uibase/inc/shdwcrsr.hxx | 2
sw/source/uibase/inc/srtdlg.hxx | 8 +--
sw/source/uibase/inc/swcont.hxx | 6 +-
sw/source/uibase/inc/swuicnttab.hxx | 14 +++---
sw/source/uibase/inc/swuiidxmrk.hxx | 2
sw/source/uibase/inc/swuipardlg.hxx | 2
sw/source/uibase/inc/swwrtshitem.hxx | 2
sw/source/uibase/inc/tabledlg.hxx | 2
sw/source/uibase/inc/tablemgr.hxx | 2
sw/source/uibase/inc/tautofmt.hxx | 16 +++----
sw/source/uibase/inc/tmpdlg.hxx | 2
sw/source/uibase/inc/uiitems.hxx | 4 -
sw/source/uibase/inc/uivwimp.hxx | 2
sw/source/uibase/inc/unoatxt.hxx | 4 -
sw/source/uibase/inc/unodispatch.hxx | 2
sw/source/uibase/inc/unomod.hxx | 2
sw/source/uibase/inc/unotools.hxx | 4 -
sw/source/uibase/inc/usrpref.hxx | 4 -
sw/source/uibase/inc/wrtsh.hxx | 6 +-
sw/source/uibase/lingu/sdrhhcwrap.hxx | 8 +--
sw/source/uibase/ribbar/workctrl.cxx | 6 +-
sw/source/uibase/sidebar/StylePresetsPanel.hxx | 2
sw/source/uibase/sidebar/ThemePanel.cxx | 2
sw/source/uibase/uno/unomailmerge.cxx | 2
test/source/diff/diff.cxx | 4 -
testtools/source/bridgetest/multi.cxx | 2
271 files changed, 810 insertions(+), 810 deletions(-)
New commits:
commit 17e712ccc8fa93d57672916e3c8adaa8febc9f8c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Mar 13 15:46:49 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Mar 13 15:41:42 2020 +0100
Revert "loplugin:constfields in sw"
This reverts commit 4969f4c0d3e2581aaa8a5b5a5769840fa6b6f8ea.
Change-Id: I527e9366b05e8a20633720e334395b285991c524
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90473
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/test/bootstrapfixture.hxx
b/include/test/bootstrapfixture.hxx
index 590c9a7f7e93..84cf1ade2728 100644
--- a/include/test/bootstrapfixture.hxx
+++ b/include/test/bootstrapfixture.hxx
@@ -42,8 +42,8 @@ enum ValidationFormat
// run of unit tests ...
class OOO_DLLPUBLIC_TEST BootstrapFixture : public BootstrapFixtureBase
{
- bool const m_bNeedUCB;
- bool const m_bAssertOnDialog;
+ bool m_bNeedUCB;
+ bool m_bAssertOnDialog;
protected:
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
diff --git a/include/test/container/xelementaccess.hxx
b/include/test/container/xelementaccess.hxx
index d9796a2f6c86..95ee85162da9 100644
--- a/include/test/container/xelementaccess.hxx
+++ b/include/test/container/xelementaccess.hxx
@@ -36,7 +36,7 @@ protected:
~XElementAccess() {}
private:
- css::uno::Type const m_aType;
+ css::uno::Type m_aType;
};
} // namespace apitest
diff --git a/include/test/container/xindexaccess.hxx
b/include/test/container/xindexaccess.hxx
index aa4273ded053..64a34b8bf296 100644
--- a/include/test/container/xindexaccess.hxx
+++ b/include/test/container/xindexaccess.hxx
@@ -36,7 +36,7 @@ protected:
~XIndexAccess() {}
private:
- sal_Int32 const m_nItems;
+ sal_Int32 m_nItems;
};
} // namespace apitest
diff --git a/include/test/container/xnamecontainer.hxx
b/include/test/container/xnamecontainer.hxx
index 6c0b24d20e0d..221ef2a4473a 100644
--- a/include/test/container/xnamecontainer.hxx
+++ b/include/test/container/xnamecontainer.hxx
@@ -49,7 +49,7 @@ protected:
~XNameContainer() {}
private:
- OUString const m_aName;
+ OUString m_aName;
css::uno::Any m_aElement;
};
diff --git a/include/test/container/xnamed.hxx
b/include/test/container/xnamed.hxx
index de8618ce4436..2b323e6f95b9 100644
--- a/include/test/container/xnamed.hxx
+++ b/include/test/container/xnamed.hxx
@@ -40,7 +40,7 @@ protected:
~XNamed() {}
private:
- OUString const m_aTestName;
+ OUString m_aTestName;
};
}
diff --git a/include/test/container/xnamereplace.hxx
b/include/test/container/xnamereplace.hxx
index a5e7fe516657..ecf2fac83798 100644
--- a/include/test/container/xnamereplace.hxx
+++ b/include/test/container/xnamereplace.hxx
@@ -37,7 +37,7 @@ protected:
~XNameReplace() {}
private:
- OUString const m_aReplacementName;
+ OUString m_aReplacementName;
css::uno::Any m_aReplacementElement;
};
diff --git a/include/test/sheet/xformulaquery.hxx
b/include/test/sheet/xformulaquery.hxx
index 662bc6c90fc6..8382e961a96a 100644
--- a/include/test/sheet/xformulaquery.hxx
+++ b/include/test/sheet/xformulaquery.hxx
@@ -45,10 +45,10 @@ protected:
private:
css::uno::Reference<css::table::XCell> m_xCell;
- css::table::CellRangeAddress const m_aCellRangeAddressDependents;
- css::table::CellRangeAddress const m_aCellRangeAddressPrecedents;
- unsigned int const m_nIdxDependents;
- unsigned int const m_nIdxPrecedents;
+ css::table::CellRangeAddress m_aCellRangeAddressDependents;
+ css::table::CellRangeAddress m_aCellRangeAddressPrecedents;
+ unsigned int m_nIdxDependents;
+ unsigned int m_nIdxPrecedents;
};
} // namespace apitest
diff --git a/include/test/sheet/xnamedranges.hxx
b/include/test/sheet/xnamedranges.hxx
index 3ce90f8f3401..8d02773f8eaf 100644
--- a/include/test/sheet/xnamedranges.hxx
+++ b/include/test/sheet/xnamedranges.hxx
@@ -49,7 +49,7 @@ protected:
css::uno::Reference<css::sheet::XSpreadsheet> xSheet;
private:
- OUString const maNameToRemove;
+ OUString maNameToRemove;
};
} // namespace apitest
diff --git a/include/test/sheet/xspreadsheetdocument.hxx
b/include/test/sheet/xspreadsheetdocument.hxx
index ff60815d33dd..8f5662489059 100644
--- a/include/test/sheet/xspreadsheetdocument.hxx
+++ b/include/test/sheet/xspreadsheetdocument.hxx
@@ -27,7 +27,7 @@ protected:
~XSpreadsheetDocument() {}
private:
- sal_Int32 const mnSheets;
+ sal_Int32 mnSheets;
};
}
diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx
index 7d1c64fc50e1..32c20997808f 100644
--- a/include/test/unoapi_test.hxx
+++ b/include/test/unoapi_test.hxx
@@ -32,7 +32,7 @@ protected:
private:
- OUString const m_aBaseString;
+ OUString m_aBaseString;
};
#endif // INCLUDED_TEST_UNOAPI_TEST_HXX
diff --git a/include/test/util/xreplaceable.hxx
b/include/test/util/xreplaceable.hxx
index 59716f013eae..9f33feeb5d9d 100644
--- a/include/test/util/xreplaceable.hxx
+++ b/include/test/util/xreplaceable.hxx
@@ -29,8 +29,8 @@ protected:
~XReplaceable() {}
private:
- OUString const maSearchString;
- OUString const maReplaceString;
+ OUString maSearchString;
+ OUString maReplaceString;
};
}
diff --git a/include/test/util/xsearchable.hxx
b/include/test/util/xsearchable.hxx
index 9fcbb5d27b88..9f45f051edff 100644
--- a/include/test/util/xsearchable.hxx
+++ b/include/test/util/xsearchable.hxx
@@ -30,8 +30,8 @@ public:
virtual css::uno::Reference< css::uno::XInterface > init() = 0;
private:
- OUString const maSearchString;
- sal_Int32 const mnCount;
+ OUString maSearchString;
+ sal_Int32 mnCount;
};
}
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx
b/sw/inc/EnhancedPDFExportHelper.hxx
index 933f7510c6e8..6aa5867377eb 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -205,8 +205,8 @@ class SwEnhancedPDFExportHelper
* in a page range without empty pages, or -1 if this page is empty. */
std::vector< sal_Int32 > maPageNumberMap;
- bool const mbSkipEmptyPages;
- bool const mbEditEngineOnly;
+ bool mbSkipEmptyPages;
+ bool mbEditEngineOnly;
const SwPrintData& mrPrintData;
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index 91938ebfe0a5..5b62429a1336 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -44,8 +44,8 @@ public:
class SwUndoFieldFromDoc final : public SwUndoField
{
std::unique_ptr<SwField> pOldField, pNewField;
- SwMsgPoolItem * const pHint;
- bool const bUpdate;
+ SwMsgPoolItem * pHint;
+ bool bUpdate;
void DoImpl();
@@ -64,7 +64,7 @@ public:
class SwUndoFieldFromAPI final : public SwUndoField
{
css::uno::Any aOldVal, aNewVal;
- sal_uInt16 const nWhich;
+ sal_uInt16 nWhich;
void DoImpl();
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 989f9aff19ec..e53c537b758e 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -61,8 +61,8 @@ private:
StartedLink(sal_Int32 startPosition, const OUString& characterStyle) :
mStartPosition(startPosition), mCharacterStyle(characterStyle)
{
}
- sal_Int32 const mStartPosition;
- OUString const mCharacterStyle;
+ sal_Int32 mStartPosition;
+ OUString mCharacterStyle;
};
/** A link that has been encountered while parsing a tox.
@@ -76,8 +76,8 @@ private:
{
}
SwFormatINetFormat mINetFormat;
- sal_Int32 const mStartTextPos;
- sal_Int32 const mEndTextPos;
+ sal_Int32 mStartTextPos;
+ sal_Int32 mEndTextPos;
};
std::vector<std::unique_ptr<ClosedLink>> m_ClosedLinks;
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx
b/sw/inc/ToxTabStopTokenHandler.hxx
index f951fb229583..5282f6897aaf 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -100,10 +100,10 @@ private:
long
CalculatePageMarginFromPageDescription(const SwTextNode& targetNode) const;
- sal_uInt32 const mIndexOfSectionNode;
+ sal_uInt32 mIndexOfSectionNode;
const SwPageDesc& mDefaultPageDescription;
- bool const mTabPositionIsRelativeToParagraphIndent;
- TabStopReferencePolicy const mTabStopReferencePolicy;
+ bool mTabPositionIsRelativeToParagraphIndent;
+ TabStopReferencePolicy mTabStopReferencePolicy;
};
}
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 9f2aa0daf5fe..1641c6fc0dc8 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -120,7 +120,7 @@ class SwAccessibleMap final : public
::accessibility::IAccessibleViewForwarder,
//mpSelectedFrameMap contains the old selected objects.
std::unique_ptr<SwAccessibleContextMap_Impl> mpSeletedFrameMap;
- OUString const maDocName;
+ OUString maDocName;
//InvalidateShapeInParaSelection() method is responsible for the updating
the selected states of the objects.
void InvalidateShapeInParaSelection();
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index ede55a43310b..78b62b4be607 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -39,7 +39,7 @@ class SwAutoCompleteWord
/// contains extended strings carrying source information
editeng::SortedAutoCompleteStrings m_WordList;
- editeng::Trie const m_LookupTree;
+ editeng::Trie m_LookupTree;
SwAutoCompleteStringPtrDeque m_aLRUList;
std::unique_ptr<SwAutoCompleteWord_Impl> m_pImpl;
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index bf3fef1711f9..86e33f4cb618 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -194,7 +194,7 @@ class SwCalc
sal_Int32 m_nCommandPos;
SwDoc& m_rDoc;
- SvtSysLocale const m_aSysLocale;
+ SvtSysLocale m_aSysLocale;
const LocaleDataWrapper* m_pLocaleDataWrapper;
CharClass* m_pCharClass;
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index b4d94c5c483f..29eafc11240c 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -30,8 +30,8 @@ enum class Master_CollCondition;
struct CommandStruct
{
- Master_CollCondition const nCnd;
- sal_uLong const nSubCond;
+ Master_CollCondition nCnd;
+ sal_uLong nSubCond;
};
sal_Int16 GetCommandContextIndex( const OUString &rContextName );
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 7d7dcd705559..845e98da8dff 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -43,7 +43,7 @@ struct SwFillCursorPos
sal_uInt16 nSpaceOnlyCnt; ///< number of spaces to insert ("only spaces,
no tabs" mode)
sal_uInt16 nColumnCnt; ///< number of necessary column breaks
sal_Int16 eOrient; ///< paragraph alignment
- SwFillMode const eMode; ///< desired fill-up rule
+ SwFillMode eMode; ///< desired fill-up rule
SwFillCursorPos( SwFillMode eMd ) :
nParaCnt( 0 ), nTabCnt( 0 ), nSpaceCnt( 0 ), nSpaceOnlyCnt(0),
nColumnCnt( 0 ),
eOrient( css::text::HoriOrientation::NONE ), eMode( eMd )
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index f1965acdfc95..03f3ab74d11d 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -50,7 +50,7 @@ namespace sw
// FieldType for DDE
class SW_DLLPUBLIC SwDDEFieldType final : public SwFieldType
{
- OUString const aName;
+ OUString aName;
OUString aExpansion;
tools::SvRef<sfx2::SvBaseLink> refLink;
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 5fd4212eeea2..5c8187dafa13 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -377,7 +377,7 @@ public:
class SAL_DLLPUBLIC_RTTI SwMacroFieldType final : public SwFieldType
{
- SwDoc* const m_pDoc;
+ SwDoc* m_pDoc;
public:
SwMacroFieldType(SwDoc*);
@@ -426,7 +426,7 @@ public:
class SAL_DLLPUBLIC_RTTI SwPostItFieldType final : public SwFieldType
{
private:
- SwDoc* const mpDoc;
+ SwDoc* mpDoc;
public:
SwPostItFieldType(SwDoc* pDoc);
@@ -678,7 +678,7 @@ public:
class SwScriptFieldType final : public SwFieldType
{
- SwDoc* const m_pDoc;
+ SwDoc* m_pDoc;
public:
SwScriptFieldType( SwDoc* pDoc );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 53b91f44db98..f19687c4d307 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -118,7 +118,7 @@ enum class ParaBreakType {
/// For querying the INet-attributes for Navigator.
struct SwGetINetAttr
{
- OUString const sText;
+ OUString sText;
const SwTextINetFormat& rINetAttr;
SwGetINetAttr( const OUString& rText, const SwTextINetFormat& rAttr )
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 18ae54ccd834..95673e62b2c8 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -144,7 +144,7 @@ class SwSetExpField;
class SW_DLLPUBLIC SwSetExpFieldType final : public SwValueFieldType
{
- OUString const m_sName;
+ OUString m_sName;
OUString m_sDelim;
sal_uInt16 m_nType;
sal_uInt8 m_nLevel;
@@ -270,7 +270,7 @@ inline bool SwSetExpField::IsSequenceField() const
class SAL_DLLPUBLIC_RTTI SwInputFieldType final : public SwFieldType
{
- SwDoc* const mpDoc;
+ SwDoc* mpDoc;
public:
SwInputFieldType( SwDoc* pDoc );
@@ -286,7 +286,7 @@ class SW_DLLPUBLIC SwInputField final : public SwField
OUString maHelp;
OUString maToolTip;
sal_uInt16 mnSubType;
- bool const mbIsFormField;
+ bool mbIsFormField;
SwFormatField* mpFormatField; // attribute to which the <SwInputField>
belongs to
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 1cd3b0f85c68..10c4faa78adf 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -241,7 +241,7 @@ class SW_DLLPUBLIC SwFieldType : public SwModify, public
sw::BroadcasterMixin
{
css::uno::WeakReference<css::beans::XPropertySet> m_wXFieldMaster;
- SwFieldIds const m_nWhich;
+ SwFieldIds m_nWhich;
friend void FinitUI(); ///< In order to delete pointer!
static std::vector<OUString>* s_pFieldNames;
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 13145771096a..1f26be54263e 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -162,7 +162,7 @@ enum class SwFormatFieldHintWhich
class SW_DLLPUBLIC SwFormatFieldHint final : public SfxHint
{
const SwFormatField* m_pField;
- SwFormatFieldHintWhich const m_nWhich;
+ SwFormatFieldHintWhich m_nWhich;
const SwView* m_pView;
public:
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 08b4d11c86ad..1a9e634dc91b 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -32,7 +32,7 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient
{
- bool const m_bActive; ///< Only for controlling (creation of
content).
+ bool m_bActive; ///< Only for controlling (creation of content).
public:
SwFormatHeader( bool bOn = false );
@@ -63,7 +63,7 @@ public:
class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient
{
- bool const m_bActive; // Only for controlling (creation of content).
+ bool m_bActive; // Only for controlling (creation of content).
public:
SwFormatFooter( bool bOn = false );
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index a7f9fa8d9b57..d739925f81f4 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -268,7 +268,7 @@ namespace sw
};
struct DrawFrameFormatHint final: SfxHint
{
- DrawFrameFormatHintId const m_eId;
+ DrawFrameFormatHintId m_eId;
DrawFrameFormatHint(DrawFrameFormatHintId eId) : m_eId(eId) {};
virtual ~DrawFrameFormatHint() override;
};
diff --git a/sw/inc/gotodlg.hxx b/sw/inc/gotodlg.hxx
index 0c79484553aa..a7971bec225f 100644
--- a/sw/inc/gotodlg.hxx
+++ b/sw/inc/gotodlg.hxx
@@ -37,7 +37,7 @@ public:
private:
SwView *m_pCreateView;
- SfxBindings * const m_rBindings;
+ SfxBindings *m_rBindings;
sal_uInt16 mnMaxPageCnt;
std::unique_ptr<weld::Entry> mxMtrPageCtrl;
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index f43fd0c1dd3d..55d0f99ddb82 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -80,7 +80,7 @@ public:
class SAL_DLLPUBLIC_RTTI SwRotationGrf : public SfxUInt16Item
{
private:
- Size const m_aUnrotatedSize;
+ Size m_aUnrotatedSize;
// tdf#115529 check and evtl. correct value, it is in 10th
// degrees and *has* to be in the range [0 .. 3600[
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index d627eda0988c..17874777c882 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public
editeng::HangulHanjaConversion
bool m_bIsDrawObj;
bool m_bIsOtherContent;
bool m_bStartChk;
- bool const m_bIsSelection; ///< true if only the selected text
should be converted
+ bool m_bIsSelection; ///< true if only the selected text
should be converted
bool m_bStartDone;
bool m_bEndDone;
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index bb322c4c640a..9a79579c16ef 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -64,15 +64,15 @@ public:
class SwFormatChg final : public SwMsgPoolItem
{
public:
- SwFormat * const pChangedFormat;
+ SwFormat *pChangedFormat;
SwFormatChg( SwFormat *pFormat );
};
class SwInsText final : public SwMsgPoolItem
{
public:
- sal_Int32 const nPos;
- sal_Int32 const nLen;
+ sal_Int32 nPos;
+ sal_Int32 nLen;
SwInsText( sal_Int32 nP, sal_Int32 nL );
};
@@ -80,7 +80,7 @@ public:
class SwDelChr final : public SwMsgPoolItem
{
public:
- sal_Int32 const nPos;
+ sal_Int32 nPos;
SwDelChr( sal_Int32 nP );
};
@@ -88,8 +88,8 @@ public:
class SwDelText final : public SwMsgPoolItem
{
public:
- sal_Int32 const nStart;
- sal_Int32 const nLen;
+ sal_Int32 nStart;
+ sal_Int32 nLen;
SwDelText( sal_Int32 nS, sal_Int32 nL );
};
@@ -112,8 +112,8 @@ public:
class RedlineDelText final : public SfxHint
{
public:
- sal_Int32 const nStart;
- sal_Int32 const nLen;
+ sal_Int32 nStart;
+ sal_Int32 nLen;
RedlineDelText(sal_Int32 nS, sal_Int32 nL);
};
@@ -133,9 +133,9 @@ public:
class SwUpdateAttr final : public SwMsgPoolItem
{
private:
- sal_Int32 const m_nStart;
- sal_Int32 const m_nEnd;
- sal_uInt16 const m_nWhichAttr;
+ sal_Int32 m_nStart;
+ sal_Int32 m_nEnd;
+ sal_uInt16 m_nWhichAttr;
std::vector<sal_uInt16> m_aWhichFmtAttrs; // attributes changed inside
RES_TXTATR_AUTOFMT
public:
@@ -227,7 +227,7 @@ public:
*/
class SwAttrSetChg final : public SwMsgPoolItem
{
- bool const m_bDelSet;
+ bool m_bDelSet;
SwAttrSet* m_pChgSet; ///< what has changed
const SwAttrSet* m_pTheChgdSet; ///< is only used to compare
public:
@@ -254,7 +254,7 @@ public:
class SwCondCollCondChg final : public SwMsgPoolItem
{
public:
- SwFormat * const pChangedFormat;
+ SwFormat *pChangedFormat;
SwCondCollCondChg( SwFormat *pFormat );
};
@@ -287,7 +287,7 @@ public:
class SwStringMsgPoolItem final : public SwMsgPoolItem
{
- OUString const m_sStr;
+ OUString m_sStr;
public:
const OUString& GetString() const { return m_sStr; }
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 88b9839bdee5..8ed20b83fb36 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -54,7 +54,7 @@ class SwHTMLTableLayoutCnts
sal_uInt8 nPass1Done; ///< How many times has Pass 1 been called?
sal_uInt8 nWidthSet; ///< How many times has the width been set?
- bool const bNoBreakTag; ///< <NOBR>-Tag over complete content.
+ bool bNoBreakTag; ///< <NOBR>-Tag over complete content.
public:
@@ -86,10 +86,10 @@ class SwHTMLTableLayoutCell
sal_uInt16 nRowSpan; ///< ROWSPAN of cell.
sal_uInt16 nColSpan; ///< COLSPAN of cell.
- sal_uInt16 const nWidthOption; ///< Given width of cell in Twip
or %.
+ sal_uInt16 nWidthOption; ///< Given width of cell in Twip or %.
- bool const bPercentWidthOption : 1; ///< nWidth is %-value.
- bool const bNoWrapOption : 1; ///< NOWRAP-option.
+ bool bPercentWidthOption : 1; ///< nWidth is %-value.
+ bool bNoWrapOption : 1; ///< NOWRAP-option.
public:
@@ -131,7 +131,7 @@ class SwHTMLTableLayoutColumn
sal_uInt16 nWidthOption; ///< Options of <COL> or <TD>/<TH>.
bool bRelWidthOption : 1;
- bool const bLeftBorder : 1;
+ bool bLeftBorder : 1;
public:
@@ -178,11 +178,11 @@ class SwHTMLTableLayout
sal_uLong m_nMin; ///< Minimal width of table (Twips).
sal_uLong m_nMax; ///< Maximal width of table (Twips).
- sal_uInt16 const m_nRows; ///< Row count.
+ sal_uInt16 m_nRows; ///< Row count.
sal_uInt16 m_nCols; ///< Column count.
- sal_uInt16 const m_nLeftMargin; ///< Space to left margin
(from paragraph).
- sal_uInt16 const m_nRightMargin; ///< Space to left margin
(from paragraph).
+ sal_uInt16 m_nLeftMargin; ///< Space to left margin (from
paragraph).
+ sal_uInt16 m_nRightMargin; ///< Space to left margin (from
paragraph).
sal_uInt16 m_nInhAbsLeftSpace; ///< Space inherited from
surrounding box
sal_uInt16 m_nInhAbsRightSpace; ///< that was added to boxes.
@@ -193,16 +193,16 @@ class SwHTMLTableLayout
sal_uInt16 m_nRelTabWidth; ///< Relative width of table.
sal_uInt16 m_nWidthOption; ///< Width of table (in Twips or %).
- sal_uInt16 const m_nCellPadding; ///< Space to contents (in
Twips).
- sal_uInt16 const m_nCellSpacing; ///< Cell spacing (in Twips).
- sal_uInt16 const m_nBorder; /** Line strength of outer
border, or rather the
+ sal_uInt16 m_nCellPadding; ///< Space to contents (in Twips).
+ sal_uInt16 m_nCellSpacing; ///< Cell spacing (in Twips).
+ sal_uInt16 m_nBorder; /** Line strength of outer border,
or rather the
space needed for it as calculated by
Netscape. */
- SwTwips const m_nLeftBorderWidth;
- SwTwips const m_nRightBorderWidth;
+ SwTwips m_nLeftBorderWidth;
+ SwTwips m_nRightBorderWidth;
sal_uInt16 m_nInhLeftBorderWidth;
sal_uInt16 m_nInhRightBorderWidth;
- SwTwips const m_nBorderWidth;
+ SwTwips m_nBorderWidth;
sal_uInt16 m_nDelayedResizeAbsAvail; ///< Param for delayed Resize.
sal_uInt16 m_nLastResizeAbsAvail;
@@ -210,11 +210,11 @@ class SwHTMLTableLayout
sal_uInt8 m_nPass1Done; ///< Reference-values for
sal_uInt8 m_nWidthSet; ///< the runs through loop.
- SvxAdjust const m_eTableAdjust; ///< Alignment of table.
+ SvxAdjust m_eTableAdjust; ///< Alignment of table.
- bool const m_bColsOption : 1; ///< Table has a COLS-option.
- bool const m_bColTags : 1; ///< Table has COL/COLGRP tags.
- bool const m_bPercentWidthOption : 1; ///< Width is given in percent.
+ bool m_bColsOption : 1; ///< Table has a COLS-option.
+ bool m_bColTags : 1; ///< Table has COL/COLGRP tags.
+ bool m_bPercentWidthOption : 1; ///< Width is given in percent.
bool m_bUseRelWidth : 1; ///< SwTable gets relative width.
bool m_bMustResize : 1; ///< Table width must be defined.
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 58b721af8007..7020bd431bb7 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -128,7 +128,7 @@ class SAL_DLLPUBLIC_RTTI SwInsertConfig final : public
utl::ConfigItem
bool m_bCaptionOrderNumberingFirst; //#i61007# caption order
starting with numbering
SwInsertTableOptions m_aInsTableOpts;
- bool const m_bIsWeb;
+ bool m_bIsWeb;
const css::uno::Sequence<OUString>& GetPropertyNames() const;
diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx
index 7ca5397e3e81..d9d32a80f11e 100644
--- a/sw/inc/modeltoviewhelper.hxx
+++ b/sw/inc/modeltoviewhelper.hxx
@@ -95,9 +95,9 @@ class ModelToViewHelper
, m_bVisible(bVisible)
{
}
- sal_Int32 const m_nModelPos;
- sal_Int32 const m_nViewPos;
- bool const m_bVisible;
+ sal_Int32 m_nModelPos;
+ sal_Int32 m_nViewPos;
+ bool m_bVisible;
};
typedef std::vector< ConversionMapEntry > ConversionMap;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 36ce909cb7cf..36d6e945d16e 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -81,7 +81,7 @@ class SW_DLLPUBLIC SwNode
{
friend class SwNodes;
- SwNodeType const m_nNodeType;
+ SwNodeType m_nNodeType;
/// For text nodes: level of auto format. Was put here because we had
still free bits.
sal_uInt8 m_nAFormatNumLvl : 3;
@@ -100,7 +100,7 @@ private:
#ifdef DBG_UTIL
static long s_nSerial;
- long const m_nSerial;
+ long m_nSerial;
#endif
/// all SwFrameFormat that are anchored at the node
@@ -307,7 +307,7 @@ class SAL_DLLPUBLIC_RTTI SwStartNode: public SwNode
friend class SwEndNode; ///< to set the theEndOfSection !!
SwEndNode* m_pEndOfSection;
- SwStartNodeType const m_eStartNodeType;
+ SwStartNodeType m_eStartNodeType;
/// for the initial StartNode
SwStartNode( SwNodes& rNodes, sal_uLong nPos );
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 8d8c77d1c6e0..c5044e19a74e 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -357,7 +357,7 @@ class SwPageDescExt
public:
SwPageDesc m_PageDesc;
private:
- SwDoc * const m_pDoc;
+ SwDoc * m_pDoc;
OUString m_sFollow;
void SetPageDesc(const SwPageDesc & rPageDesc);
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index 40eb643889d2..41a2835ebe51 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.hxx
@@ -25,7 +25,7 @@
class SwPrintOptions final : public SwPrintData, public utl::ConfigItem
{
private:
- bool const m_bIsWeb;
+ bool m_bIsWeb;
css::uno::Sequence<OUString> GetPropertyNames() const;
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 5bbccc87dc93..e75ad1aaa28d 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -94,7 +94,7 @@ class SW_DLLPUBLIC SwRedlineData
DateTime m_aStamp;
RedlineType m_eType;
bool m_bAutoFormat;
- std::size_t const m_nAuthor;
+ std::size_t m_nAuthor;
sal_uInt16 m_nSeqNo;
public:
@@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwRangeRedline : public SwPaM
SwNodeIndex* m_pContentSect;
bool m_bDelLastPara : 1;
bool m_bIsVisible : 1;
- sal_uInt32 const m_nId;
+ sal_uInt32 m_nId;
std::optional<long> m_oLOKLastNodeTop;
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index a55e38eebcc3..080fb97071c7 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -150,12 +150,12 @@ public:
class SW_DLLPUBLIC SwReader: public SwDocFac
{
SvStream* mpStrm;
- tools::SvRef<SotStorage> const mpStg;
+ tools::SvRef<SotStorage> mpStg;
css::uno::Reference < css::embed::XStorage > mxStg;
- SfxMedium* const mpMedium; // Who wants to obtain a Medium (W4W).
+ SfxMedium* mpMedium; // Who wants to obtain a Medium (W4W).
- SwPaM* const mpCursor;
- OUString const maFileName;
+ SwPaM* mpCursor;
+ OUString maFileName;
OUString msBaseURL;
bool mbSkipImages;
@@ -508,7 +508,7 @@ class SW_DLLPUBLIC SwWriter
css::uno::Reference < css::embed::XStorage > m_xStg;
SfxMedium* m_pMedium;
- SwPaM* const m_pOutPam;
+ SwPaM* m_pOutPam;
SwCursorShell *m_pShell;
SwDoc &m_rDoc;
@@ -535,9 +535,9 @@ ErrCode GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS
);
struct SwReaderWriterEntry
{
Reader* pReader;
- FnGetReader const fnGetReader;
- FnGetWriter const fnGetWriter;
- bool const bDelReader;
+ FnGetReader fnGetReader;
+ FnGetWriter fnGetWriter;
+ bool bDelReader;
SwReaderWriterEntry( const FnGetReader fnReader, const FnGetWriter
fnWriter, bool bDel )
: pReader( nullptr ), fnGetReader( fnReader ), fnGetWriter( fnWriter
), bDelReader( bDel )
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 85b18b0c2478..ef81f1a64eaa 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -26,37 +26,37 @@
struct SW_DLLPUBLIC ShellResource
{
- OUString const aPostItAuthor;
- OUString const aPostItPage;
- OUString const aPostItLine;
+ OUString aPostItAuthor;
+ OUString aPostItPage;
+ OUString aPostItLine;
// Calc error-strings.
- OUString const aCalc_Syntax;
- OUString const aCalc_ZeroDiv;
- OUString const aCalc_Brack;
- OUString const aCalc_Pow;
- OUString const aCalc_Overflow;
- OUString const aCalc_Default;
- OUString const aCalc_Error;
+ OUString aCalc_Syntax;
+ OUString aCalc_ZeroDiv;
+ OUString aCalc_Brack;
+ OUString aCalc_Pow;
+ OUString aCalc_Overflow;
+ OUString aCalc_Default;
+ OUString aCalc_Error;
// For GetRefField - referenced item not found.
- OUString const aGetRefField_RefItemNotFound;
+ OUString aGetRefField_RefItemNotFound;
// For some list boxes - string "none"
- OUString const aStrNone;
+ OUString aStrNone;
// For fixed fields.
- OUString const aFixedStr;
+ OUString aFixedStr;
// Custom fields of type css::util::Duration.
- OUString const sDurationFormat;
+ OUString sDurationFormat;
//Names of TOXs.
- OUString const aTOXIndexName;
- OUString const aTOXUserName;
- OUString const aTOXContentName;
- OUString const aTOXIllustrationsName;
- OUString const aTOXObjectsName;
- OUString const aTOXTablesName;
- OUString const aTOXAuthoritiesName;
- OUString const aTOXCitationName;
+ OUString aTOXIndexName;
+ OUString aTOXUserName;
+ OUString aTOXContentName;
+ OUString aTOXIllustrationsName;
+ OUString aTOXObjectsName;
+ OUString aTOXTablesName;
+ OUString aTOXAuthoritiesName;
+ OUString aTOXCitationName;
std::vector<OUString> aDocInfoLst;
@@ -79,9 +79,9 @@ struct SW_DLLPUBLIC ShellResource
private:
void GetAutoFormatNameLst_() const;
mutable std::unique_ptr<std::vector<OUString>> pAutoFormatNameLst;
- OUString const sPageDescFirstName;
- OUString const sPageDescFollowName;
- OUString const sPageDescName;
+ OUString sPageDescFirstName;
+ OUString sPageDescFollowName;
+ OUString sPageDescName;
};
inline const std::vector<OUString>& ShellResource::GetAutoFormatNameLst() const
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 2475470bf056..ee502b5e220c 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -62,8 +62,8 @@ struct SwArgsBase // used for text conversion
(Hangul/Hanja, ...)
struct SwConversionArgs : SwArgsBase
{
OUString aConvText; // convertible text found
- LanguageType const nConvSrcLang; // (source) language to look for
- LanguageType nConvTextLang; // language of aConvText (if the
latter one was found)
+ LanguageType nConvSrcLang; // (source) language to look for
+ LanguageType nConvTextLang; // language of aConvText (if the
latter one was found)
// used for chinese translation
LanguageType nConvTargetLang; // target language of text to be
changed
@@ -89,7 +89,7 @@ struct SwSpellArgs : SwArgsBase
css::uno::Reference< css::linguistic2::XSpellAlternatives > xSpellAlt;
- bool const bIsGrammarCheck;
+ bool bIsGrammarCheck;
SwSpellArgs(css::uno::Reference<
css::linguistic2::XSpellChecker1 > const &rxSplChk,
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 616ae10fd646..0fc402360e2d 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -145,7 +145,7 @@ private:
friend void InitCore(); // For creating/deleting of version
maps.
friend void FinitCore();
- SwDoc* const m_pDoc;
+ SwDoc* m_pDoc;
public:
SwAttrPool( SwDoc* pDoc );
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index e2577735b9af..0a6b65a33897 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.hxx
@@ -30,7 +30,7 @@ class EmbeddedObjectRef;
class SwOleClient final : public SfxInPlaceClient
{
bool m_IsInDoVerb;
- bool const m_IsOldCheckForOLEInCaption;
+ bool m_IsOldCheckForOLEInCaption;
virtual void ObjectAreaChanged() override;
virtual void RequestNewObjectArea( tools::Rectangle& ) override;
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index 05115ed10b27..de273d679b8b 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -31,7 +31,7 @@ class SwTextNode;
// during spell check
class SwScanner
{
- std::function<LanguageType (sal_Int32, sal_Int32, bool)> const
m_pGetLangOfChar;
+ std::function<LanguageType (sal_Int32, sal_Int32, bool)> m_pGetLangOfChar;
OUString m_aWord;
const OUString m_aPreDashReplacementText;
OUString m_aText;
@@ -43,8 +43,8 @@ class SwScanner
sal_Int32 m_nLength;
sal_Int32 m_nOverriddenDashCount;
LanguageType m_aCurrentLang;
- sal_uInt16 const m_nWordType;
- bool const m_bClip;
+ sal_uInt16 m_nWordType;
+ bool m_bClip;
public:
SwScanner(const std::function<LanguageType(sal_Int32, sal_Int32, bool)>&
pGetLangOfChar,
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 0639db32f72e..e7ef81b53ef3 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -121,7 +121,7 @@ bool CheckSplitCells( const SwCursor& rCursor, sal_uInt16
nDiv,
class SwSelUnion
{
SwRect m_aUnion; // The rectangle enclosing the selection.
- SwTabFrame * const m_pTable; // The (Follow-)Table for the Union.
+ SwTabFrame *m_pTable; // The (Follow-)Table for the Union.
public:
SwSelUnion( const SwRect &rRect, SwTabFrame *pTab ) :
@@ -156,9 +156,9 @@ typedef std::vector<std::unique_ptr<FndLine_>> FndLines_t;
class FndBox_
{
- SwTableBox* const m_pBox;
+ SwTableBox* m_pBox;
FndLines_t m_Lines;
- FndLine_* const m_pUpper;
+ FndLine_* m_pUpper;
SwTableLine *m_pLineBefore; // For deleting/restoring the layout.
SwTableLine *m_pLineBehind;
@@ -191,7 +191,7 @@ public:
class FndLine_
{
- SwTableLine* const m_pLine;
+ SwTableLine* m_pLine;
FndBoxes_t m_Boxes;
FndBox_* m_pUpper;
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index b6cfb3298360..eed9e670aeae 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -158,8 +158,8 @@ public:
inline TOXTypes GetType() const;
private:
- OUString const m_aName;
- TOXTypes const m_eType;
+ OUString m_aName;
+ TOXTypes m_eType;
// @@@ public copy ctor, but no copy assignment?
SwTOXType & operator= (const SwTOXType &) = delete;
@@ -236,7 +236,7 @@ struct SW_DLLPUBLIC SwFormToken
struct SwFormTokenEqualToFormTokenType
{
- FormTokenType const eType;
+ FormTokenType eType;
SwFormTokenEqualToFormTokenType(FormTokenType _eType) : eType(_eType) {}
bool operator()(const SwFormToken & rToken)
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index 8cf7eca01452..76a865cab9ff 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -33,7 +33,7 @@ class SwScriptIterator
const OUString& m_rText;
sal_Int32 m_nChgPos;
sal_uInt16 m_nCurScript;
- bool const m_bForward;
+ bool m_bForward;
public:
SwScriptIterator( const OUString& rStr, sal_Int32 nStart,
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 80f90e302db6..8da9b70980b8 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -53,7 +53,7 @@ class SwUndo
{
SwUndoId const m_nId;
RedlineFlags m_nOrigRedlineFlags;
- ViewShellId const m_nViewShellId;
+ ViewShellId m_nViewShellId;
bool m_isRepeatIgnored; ///< for multi-selection, only repeat 1st selection
protected:
@@ -309,7 +309,7 @@ public:
class SwUndoInsLayFormat : public SwUndoFlyBase
{
sal_uLong mnCursorSaveIndexPara; // Cursor position
- sal_Int32 const mnCursorSaveIndexPos; // for undo
+ sal_Int32 mnCursorSaveIndexPos; // for undo
public:
SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32
nCntIdx );
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 196e3f32dd3a..b085aaaaf1b2 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -236,8 +236,8 @@ class SwChartDataSequence final :
::comphelper::OInterfaceContainerHelper2 m_aModifyListeners;
css::chart2::data::DataSequenceRole m_aRole;
- OUString const m_aRowLabelText;
- OUString const m_aColLabelText;
+ OUString m_aRowLabelText;
+ OUString m_aColLabelText;
rtl::Reference<SwChartDataProvider> m_xDataProvider;
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index f8b9f4265d6d..dc36615d7d4b 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -151,7 +151,7 @@ private:
SwDocShell* m_pDocShell; // Only if used as chapter
numbering.
SwNumRule* m_pNumRule;
const SfxItemPropertySet* m_pPropertySet;
- bool const m_bOwnNumRuleCreated;
+ bool m_bOwnNumRuleCreated;
protected:
virtual ~SwXNumberingRules() override;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 058812c17923..4e8fee328724 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -106,7 +106,7 @@ class SwXAutoStyles final :
public cppu::WeakImplHelper< css::style::XAutoStyles >,
public SwUnoCollection
{
- SwDocShell * const m_pDocShell;
+ SwDocShell *m_pDocShell;
css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoCharStyles;
css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoRubyStyles;
css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoParaStyles;
@@ -134,7 +134,7 @@ public:
class SwXAutoStyleFamily final : public cppu::WeakImplHelper<
css::style::XAutoStyleFamily >, public SvtListener
{
SwDocShell *m_pDocShell;
- IStyleAccess::SwAutoStyleFamily const m_eFamily;
+ IStyleAccess::SwAutoStyleFamily m_eFamily;
public:
@@ -178,9 +178,9 @@ class SwXAutoStyle final : public cppu::WeakImplHelper
public SvtListener
{
private:
- std::shared_ptr<SfxItemSet> mpSet;
- IStyleAccess::SwAutoStyleFamily const meFamily;
- SwDoc& mrDoc;
+ std::shared_ptr<SfxItemSet> mpSet;
+ IStyleAccess::SwAutoStyleFamily meFamily;
+ SwDoc& mrDoc;
/// @throws css::beans::UnknownPropertyException
/// @throws css::lang::WrappedTargetException
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 4952c6fc9dd6..59b859504ae1 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -555,7 +555,7 @@ class SwXOutlineTarget final : public cppu::WeakImplHelper
>
{
const SfxItemPropertySet* pPropSet;
- OUString const sOutlineText;
+ OUString sOutlineText;
public:
SwXOutlineTarget(const OUString& rOutlineText);
@@ -607,8 +607,8 @@ public:
// After printing the view options are restored
class SwViewOptionAdjust_Impl
{
- SwViewShell * m_pShell;
- SwViewOption const m_aOldViewOptions;
+ SwViewShell * m_pShell;
+ SwViewOption m_aOldViewOptions;
public:
SwViewOptionAdjust_Impl( SwViewShell& rSh, const SwViewOption
&rViewOptions );
~SwViewOptionAdjust_Impl();
diff --git a/sw/source/core/access/acccontext.hxx
b/sw/source/core/access/acccontext.hxx
index 8550430e69bf..4915305586ce 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -79,7 +79,7 @@ private:
std::weak_ptr<SwAccessibleMap> m_wMap;
sal_uInt32 m_nClientId; // client id in the AccessibleEventNotifier queue
- sal_Int16 const m_nRole; // immutable outside constructor
+ sal_Int16 m_nRole; // immutable outside constructor
// The current states (protected by mutex)
bool m_isShowingState : 1;
diff --git a/sw/source/core/access/accfrmobjmap.hxx
b/sw/source/core/access/accfrmobjmap.hxx
index 0c33b708ae4f..ed4ecafece0f 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -77,9 +77,9 @@ public:
*/
private:
- LayerId const m_eLayerId;
- sal_uInt32 const m_nOrdNum;
- Point const m_nPosNum;
+ LayerId m_eLayerId;
+ sal_uInt32 m_nOrdNum;
+ Point m_nPosNum;
};
diff --git a/sw/source/core/access/acchyperlink.hxx
b/sw/source/core/access/acchyperlink.hxx
index fdbc71419615..68116d99d899 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -37,8 +37,8 @@ class SwAccessibleHyperlink
friend class SwAccessibleHyperTextData;
SwFormatINetFormat * m_pHyperlink;
::rtl::Reference< SwAccessibleParagraph > m_xParagraph;
- sal_Int32 const m_nStartIndex;
- sal_Int32 const m_nEndIndex;
+ sal_Int32 m_nStartIndex;
+ sal_Int32 m_nEndIndex;
SwAccessibleHyperlink(const SwTextAttr &,
SwAccessibleParagraph &,
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index ba71be7d8caa..da0852618fa6 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -392,7 +392,7 @@ private:
SwRect maOldBox; // the old bounds for
CHILD_POS_CHANGED
// and POS_CHANGED
uno::WeakReference < XAccessible > mxAcc; // The object that fires the
event
- SwAccessibleChild const maFrameOrObj; // the child for
CHILD_POS_CHANGED and
+ SwAccessibleChild maFrameOrObj; // the child for
CHILD_POS_CHANGED and
// the same as xAcc for any
other
// event type
EventType meType; // The event type
@@ -657,8 +657,8 @@ namespace {
struct SwAccessibleParaSelection
{
- TextFrameIndex const nStartOfSelection;
- TextFrameIndex const nEndOfSelection;
+ TextFrameIndex nStartOfSelection;
+ TextFrameIndex nEndOfSelection;
SwAccessibleParaSelection(const TextFrameIndex nStartOfSelection_,
const TextFrameIndex nEndOfSelection_)
diff --git a/sw/source/core/access/accpara.cxx
b/sw/source/core/access/accpara.cxx
index 4eee91528d88..b2e2e56634c9 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2704,7 +2704,7 @@ class SwHyperlinkIter_Impl
{
SwTextFrame const& m_rFrame;
sw::MergedAttrIter m_Iter;
- TextFrameIndex const m_nStt;
+ TextFrameIndex m_nStt;
TextFrameIndex m_nEnd;
public:
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index d3cf02d8291a..14cd019bc2a4 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -80,8 +80,8 @@ class SwAccessibleTableData_Impl
Int32Set_Impl maColumns;
Point maTabFramePos;
const SwTabFrame *mpTabFrame;
- bool const mbIsInPagePreview;
- bool const mbOnlyTableColumnHeader;
+ bool mbIsInPagePreview;
+ bool mbOnlyTableColumnHeader;
void CollectData( const SwFrame *pFrame );
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index a9175808de85..2311cf8d93f6 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -61,7 +61,7 @@ namespace
}
SwCursor* m_pCursor;
- SwCursorSaveState const m_aSaveState;
+ SwCursorSaveState m_aSaveState;
};
bool lcl_ReverseMarkOrderingByEnd(const ::sw::mark::IMark* pFirst,
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 29ff1e41edd9..061932700c7c 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -186,8 +186,8 @@ class SwAttrCheckArr
sal_uInt16 m_nArrStart, m_nArrLen;
sal_uInt16 m_nFound, m_nStackCount;
SfxItemSet m_aComapeSet;
- bool const m_bNoColls;
- bool const m_bForward;
+ bool m_bNoColls;
+ bool m_bForward;
public:
SwAttrCheckArr( const SfxItemSet& rSet, bool bForward, bool bNoCollections
);
@@ -1196,7 +1196,7 @@ namespace {
/// parameters for search for attributes
struct SwFindParaAttr : public SwFindParas
{
- bool const m_bNoCollection;
+ bool m_bNoCollection;
const SfxItemSet *pSet, *pReplSet;
const i18nutil::SearchOptions2 *pSearchOpt;
SwCursor& m_rCursor;
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 0f8d83f3a035..eecda929e687 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -905,8 +905,8 @@ struct SwFindParaText : public SwFindParas
SwCursor& m_rCursor;
SwRootFrame const* m_pLayout;
utl::TextSearch m_aSText;
- bool const m_bReplace;
- bool const m_bSearchInNotes;
+ bool m_bReplace;
+ bool m_bSearchInNotes;
SwFindParaText(const i18nutil::SearchOptions2& rOpt, bool bSearchInNotes,
bool bRepl, SwCursor& rCursor, SwRootFrame const*const pLayout)
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 049cf9212ede..95e928df00e5 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -63,7 +63,7 @@ namespace {
struct PercentHdl
{
- SwDocShell* const pDSh;
+ SwDocShell* pDSh;
sal_uLong nActPos;
bool bBack, bNodeIdx;
diff --git a/sw/source/core/doc/CntntIdxStore.cxx
b/sw/source/core/doc/CntntIdxStore.cxx
index bd36e45ae6c0..98fbca5c98a7 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -85,8 +85,8 @@ namespace
struct PaMEntry
{
SwPaM* m_pPaM;
- bool const m_isMark;
- sal_Int32 const m_nContent;
+ bool m_isMark;
+ sal_Int32 m_nContent;
};
struct OffsetUpdater
{
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 91764214c133..db49e53506da 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -118,8 +118,8 @@ namespace
void lcl_SetDfltFont( DefaultFontType nFntType, SfxItemSet& rSet )
{
static struct {
- sal_uInt16 const nResLngId;
- sal_uInt16 const nResFntId;
+ sal_uInt16 nResLngId;
+ sal_uInt16 nResFntId;
} aArr[ 3 ] = {
{ RES_CHRATR_LANGUAGE, RES_CHRATR_FONT },
{ RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_FONT },
@@ -142,8 +142,8 @@ namespace
DefaultFontType nCTLFntType, SfxItemSet& rSet )
{
static struct {
- sal_uInt16 const nResLngId;
- sal_uInt16 const nResFntId;
+ sal_uInt16 nResLngId;
+ sal_uInt16 nResFntId;
DefaultFontType nFntType;
} aArr[ 3 ] = {
{ RES_CHRATR_LANGUAGE, RES_CHRATR_FONT,
static_cast<DefaultFontType>(0) },
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 34334242a2c9..91f14c19368e 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -93,7 +93,7 @@ private:
static sal_uLong NextIdx( const SwNode* pNd );
vector< SwCompareLine* > aLines;
- bool const m_bRecordDiff;
+ bool m_bRecordDiff;
// Truncate beginning and end and add all others to the LinesArray
void CheckRanges( CompareData& );
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index f3de5d3648f4..016a3849e470 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -703,8 +703,8 @@ class SwHyphArgs : public SwInterHyphInfo
const SwNode *pStart;
const SwNode *pEnd;
SwNode *pNode;
- sal_uInt16 * const pPageCnt;
- sal_uInt16 * const pPageSt;
+ sal_uInt16 *pPageCnt;
+ sal_uInt16 *pPageSt;
sal_uInt32 nNode;
sal_Int32 nPamStart;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 2a6f805f79a4..bd952576f6ae 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1392,7 +1392,7 @@ void SwTOXBaseSection::UpdateAuthorities(const
SwTOXInternational& rIntl,
static SwTOOElements lcl_IsSOObject( const SvGlobalName& rFactoryNm )
{
static const struct SoObjType {
- SwTOOElements const nFlag;
+ SwTOOElements nFlag;
// GlobalNameId
struct {
sal_uInt32 n1;
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 692d600f9ec9..f791e7d3435a 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -52,9 +52,9 @@ namespace {
class SwHTMLTableLayoutConstraints
{
- sal_uInt16 const nRow; // start row
- sal_uInt16 const nCol; // start column
- sal_uInt16 const nColSpan; // the column's COLSPAN
+ sal_uInt16 nRow; // start row
+ sal_uInt16 nCol; // start column
+ sal_uInt16 nColSpan; // the column's COLSPAN
std::unique_ptr<SwHTMLTableLayoutConstraints> pNext; // the next
constraint
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index f98197afa9ae..e314e0fc7f59 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -212,7 +212,7 @@ struct CpyPara
sal_uInt16 nCpyCnt, nInsPos;
sal_uInt16 nLnIdx, nBoxIdx;
sal_uInt8 nDelBorderFlag;
- bool const bCpyContent;
+ bool bCpyContent;
CpyPara( SwTableNode* pNd, sal_uInt16 nCopies, CpyTabFrames& rFrameArr )
: pDoc( pNd->GetDoc() ), pTableNd( pNd ), rTabFrameArr(rFrameArr),
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 3c8ffe881b78..4d12c2d2e812 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -46,7 +46,7 @@ namespace {
struct MapTableFrameFormat
{
const SwFrameFormat *pOld;
- SwFrameFormat * const pNew;
+ SwFrameFormat *pNew;
MapTableFrameFormat( const SwFrameFormat *pOldFormat,
SwFrameFormat*pNewFormat )
: pOld( pOldFormat ), pNew( pNewFormat )
{}
@@ -127,7 +127,7 @@ namespace {
struct CopyTable
{
SwDoc* m_pDoc;
- sal_uLong const m_nOldTableSttIdx;
+ sal_uLong m_nOldTableSttIdx;
MapTableFrameFormats& m_rMapArr;
SwTableLine* m_pInsLine;
SwTableBox* m_pInsBox;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 6a8e0138324d..4d5469e8fdac 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1497,7 +1497,7 @@ struct DelTabPara
SwTextNode* pLastNd;
SwNodes& rNds;
SwUndoTableToText* pUndo;
- sal_Unicode const cCh;
+ sal_Unicode cCh;
DelTabPara( SwNodes& rNodes, sal_Unicode cChar, SwUndoTableToText* pU ) :
pLastNd(nullptr), rNds( rNodes ), pUndo( pU ), cCh( cChar ) {}
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index 4bf684197a90..b23324a914aa 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -75,7 +75,7 @@ public:
private:
SwFrameFormat *pOld, *pNew;
- sal_Int16 const nType;
+ sal_Int16 nType;
};
}
diff --git a/sw/source/core/docnode/node2lay.cxx
b/sw/source/core/docnode/node2lay.cxx
index d9ec3aa1727f..a62f55ec64e6 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -38,7 +38,7 @@ class SwNode2LayImpl
std::unique_ptr<SwIterator<SwFrame, SwModify,
sw::IteratorMode::UnwrapMulti>> pIter;
SwModify* pMod;
std::vector<SwFrame*> mvUpperFrames; // To collect the Upper
- sal_uLong const nIndex; // The Index of the to-be-inserted Nodes
+ sal_uLong nIndex; // The Index of the to-be-inserted Nodes
bool bMaster : 1; // true => only Master, false => only Frames without
Follow
bool bInit : 1; // Did we already call First() at SwClient?
diff --git a/sw/source/core/docnode/threadmanager.hxx
b/sw/source/core/docnode/threadmanager.hxx
index a0a43a78f2a4..21078e7abf9a 100644
--- a/sw/source/core/docnode/threadmanager.hxx
+++ b/sw/source/core/docnode/threadmanager.hxx
@@ -128,7 +128,7 @@ class ThreadManager final
struct ThreadPred
{
- oslInterlockedCount const mnThreadID;
+ oslInterlockedCount mnThreadID;
explicit ThreadPred( oslInterlockedCount nThreadID )
: mnThreadID( nThreadID )
{}
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 295e7e25b474..4d077fe401b4 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -996,8 +996,8 @@ class NestedUserCallHdl
{
private:
SwDrawContact* mpDrawContact;
- bool const mbParentUserCallActive;
- SdrUserCallType const meParentUserCallEventType;
+ bool mbParentUserCallActive;
+ SdrUserCallType meParentUserCallEventType;
public:
NestedUserCallHdl( SwDrawContact* _pDrawContact,
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 6ffe0c8000ec..a59a0eb69790 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1254,7 +1254,7 @@ namespace {
struct RefIdsMap
{
private:
- OUString const aName;
+ OUString aName;
std::set<sal_uInt16> aIds;
std::set<sal_uInt16> aDstIds;
std::map<sal_uInt16, sal_uInt16> sequencedIds; /// ID numbers sorted by
sequence number.
diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx
index 552a61f21b34..905bc8f5ad06 100644
--- a/sw/source/core/inc/SwUndoFmt.hxx
+++ b/sw/source/core/inc/SwUndoFmt.hxx
@@ -60,8 +60,8 @@ class SwUndoFormatDelete : public SwUndo
protected:
OUString sDerivedFrom;
SwDoc * pDoc;
- OUString const sOldName;
- SfxItemSet const aOldSet;
+ OUString sOldName;
+ SfxItemSet aOldSet;
sal_uInt16 nId; // FormatId related
bool bAuto;
diff --git a/sw/source/core/inc/SwUndoPageDesc.hxx
b/sw/source/core/inc/SwUndoPageDesc.hxx
index 79a89116e484..48d8f6b28e95 100644
--- a/sw/source/core/inc/SwUndoPageDesc.hxx
+++ b/sw/source/core/inc/SwUndoPageDesc.hxx
@@ -66,7 +66,7 @@ public:
class SwUndoPageDescDelete : public SwUndo
{
- SwPageDescExt const aOld;
+ SwPageDescExt aOld;
SwDoc * pDoc;
void DoImpl();
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx
b/sw/source/core/inc/SwXMLBlockImport.hxx
index 3de78a1caaac..cfc2f50ba7d0 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -65,7 +65,7 @@ protected:
const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList ) override;
public:
- bool const bTextOnly;
+ bool bTextOnly;
OUString &m_rText;
SwXMLTextBlockImport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index 7015e3fc1f35..a86e30c8369c 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -211,7 +211,7 @@ public:
class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng
{
- short const m_nOffset;
+ short m_nOffset;
public:
SwUndoOutlineLeftRight( const SwPaM& rPam, short nOffset );
diff --git a/sw/source/core/inc/UndoDelete.hxx
b/sw/source/core/inc/UndoDelete.hxx
index 2049d8b502f2..c99939a5d0ec 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -55,10 +55,10 @@ class SwUndoDelete
bool m_bBackSp : 1; // TRUE: if Grouped and preceding content
deleted
bool m_bJoinNext: 1; // TRUE: if range is selected forwards
bool m_bTableDelLastNd : 1; // TRUE: TextNode following Table
inserted/deleted
- bool const m_bDelFullPara : 1; // TRUE: entire Nodes were deleted
+ bool m_bDelFullPara : 1; // TRUE: entire Nodes were deleted
bool m_bResetPgDesc : 1; // TRUE: reset PgDsc on following node
bool m_bResetPgBrk : 1; // TRUE: reset PgBreak on following node
- bool const m_bFromTableCopy : 1; // TRUE: called by SwUndoTableCpyTable
+ bool m_bFromTableCopy : 1; // TRUE: called by SwUndoTableCpyTable
bool SaveContent( const SwPosition* pStt, const SwPosition* pEnd,
SwTextNode* pSttTextNd, SwTextNode* pEndTextNd );
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index d85c0540e407..bf9e01439cd2 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -52,7 +52,7 @@ public:
class SwUndoDrawGroup : public SwUndo
{
std::unique_ptr<SwUndoGroupObjImpl[]> pObjArr;
- sal_uInt16 const nSize;
+ sal_uInt16 nSize;
bool bDelFormat;
public:
diff --git a/sw/source/core/inc/UndoInsert.hxx
b/sw/source/core/inc/UndoInsert.hxx
index 1e62a0a30c9c..801997d65e39 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -46,8 +46,8 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveContent
std::unique_ptr<SwRedlineData> m_pRedlData;
sal_uLong m_nNode;
sal_Int32 m_nContent, m_nLen;
- bool const m_bIsWordDelim : 1;
- bool const m_bIsAppend : 1;
+ bool m_bIsWordDelim : 1;
+ bool m_bIsAppend : 1;
bool m_bWithRsid : 1;
const SwInsertFlags m_nInsertFlags;
@@ -167,18 +167,18 @@ class SwUndoInsertLabel : public SwUndo
} NODE;
};
- OUString const m_sText;
+ OUString m_sText;
// #i39983# the separator is drawn with a character style
- OUString const m_sSeparator;
- OUString const m_sNumberSeparator;
- OUString const m_sCharacterStyle;
+ OUString m_sSeparator;
+ OUString m_sNumberSeparator;
+ OUString m_sCharacterStyle;
// #i26791# - re-store of drawing object position no longer needed
- sal_uInt16 const m_nFieldId;
- SwLabelType const m_eType;
+ sal_uInt16 m_nFieldId;
+ SwLabelType m_eType;
SdrLayerID m_nLayerId; // for character objects
- bool const m_bBefore :1;
+ bool m_bBefore :1;
bool m_bUndoKeep :1;
- bool const m_bCopyBorder :1;
+ bool m_bCopyBorder :1;
public:
SwUndoInsertLabel( const SwLabelType eTyp, const OUString &rText,
diff --git a/sw/source/core/inc/UndoNumbering.hxx
b/sw/source/core/inc/UndoNumbering.hxx
index 9490f51bc0ca..70e6149b383e 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -28,10 +28,10 @@
class SwUndoInsNum : public SwUndo, private SwUndRng
{
- SwNumRule const aNumRule;
+ SwNumRule aNumRule;
std::unique_ptr<SwHistory> pHistory;
std::unique_ptr<SwNumRule> pOldNumRule;
- OUString const sReplaceRule;
+ OUString sReplaceRule;
sal_uInt16 nLRSavePos;
public:
@@ -61,7 +61,7 @@ class SwUndoDelNum : public SwUndo, private SwUndRng
struct NodeLevel
{
sal_uLong index;
- int const level;
+ int level;
NodeLevel(sal_uLong idx, int lvl) : index(idx), level(lvl) {};
};
std::vector<NodeLevel> aNodes;
@@ -83,7 +83,7 @@ public:
class SwUndoMoveNum : public SwUndo, private SwUndRng
{
sal_uLong nNewStt;
- long const nOffset;
+ long nOffset;
public:
SwUndoMoveNum( const SwPaM& rPam, long nOffset, bool bIsOutlMv );
@@ -97,7 +97,7 @@ public:
class SwUndoNumUpDown : public SwUndo, private SwUndRng
{
- short const nOffset;
+ short nOffset;
public:
SwUndoNumUpDown( const SwPaM& rPam, short nOffset );
@@ -109,7 +109,7 @@ public:
class SwUndoNumOrNoNum : public SwUndo
{
- sal_uLong const nIdx;
+ sal_uLong nIdx;
bool mbNewNum, mbOldNum;
public:
@@ -123,10 +123,10 @@ public:
class SwUndoNumRuleStart : public SwUndo
{
- sal_uLong const nIdx;
+ sal_uLong nIdx;
sal_uInt16 nOldStt, nNewStt;
- bool const bSetSttValue : 1;
- bool const bFlag : 1;
+ bool bSetSttValue : 1;
+ bool bFlag : 1;
public:
SwUndoNumRuleStart( const SwPosition& rPos, bool bDelete );
diff --git a/sw/source/core/inc/UndoOverwrite.hxx
b/sw/source/core/inc/UndoOverwrite.hxx
index 0fe66a64d398..1a21a87a8ee4 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -69,7 +69,7 @@ struct UndoTransliterate_Data;
class SwUndoTransliterate : public SwUndo, public SwUndRng
{
std::vector< std::unique_ptr<UndoTransliterate_Data> > aChanges;
- TransliterationFlags const nType;
+ TransliterationFlags nType;
void DoTransliterate(SwDoc & rDoc, SwPaM const & rPam);
diff --git a/sw/source/core/inc/UndoRedline.hxx
b/sw/source/core/inc/UndoRedline.hxx
index 38ecd86314cb..3450b23d9167 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -33,7 +33,7 @@ class SwUndoRedline : public SwUndo, public SwUndRng
protected:
std::unique_ptr<SwRedlineData> mpRedlData;
std::unique_ptr<SwRedlineSaveDatas> mpRedlSaveData;
- SwUndoId const mnUserId;
+ SwUndoId mnUserId;
bool mbHiddenRedlines;
virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
@@ -120,7 +120,7 @@ class SwUndoCompDoc : public SwUndo, public SwUndRng
std::unique_ptr<SwRedlineData> pRedlData;
std::unique_ptr<SwUndoDelete> pUnDel, pUnDel2;
std::unique_ptr<SwRedlineSaveDatas> pRedlSaveData;
- bool const bInsert;
+ bool bInsert;
public:
SwUndoCompDoc( const SwPaM& rRg, bool bIns );
diff --git a/sw/source/core/inc/UndoSplitMove.hxx
b/sw/source/core/inc/UndoSplitMove.hxx
index 7dfab2f5820e..ad779ee44362 100644
--- a/sw/source/core/inc/UndoSplitMove.hxx
+++ b/sw/source/core/inc/UndoSplitMove.hxx
@@ -27,9 +27,9 @@ class SwUndoSplitNode: public SwUndo
std::unique_ptr<SwHistory> m_pHistory;
std::unique_ptr<SwRedlineData> pRedlData;
sal_uLong nNode;
- sal_Int32 const nContent;
+ sal_Int32 nContent;
bool bTableFlag : 1;
- bool const bChkTableStt : 1;
+ bool bChkTableStt : 1;
sal_uInt32 nParRsid;
public:
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index efca52be8f9e..27f6c5dc8e72 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -46,7 +46,7 @@ class SwTableSortBoxes;
class SwUndoInsTable : public SwUndo
{
OUString m_sTableName;
- SwInsertTableOptions const m_aInsTableOptions;
+ SwInsertTableOptions m_aInsTableOptions;
std::unique_ptr<SwDDEFieldType> m_pDDEFieldType;
std::unique_ptr<std::vector<sal_uInt16>> m_pColumnWidth;
std::unique_ptr<SwRedlineData> m_pRedlineData;
@@ -73,12 +73,12 @@ public:
class SwUndoTextToTable : public SwUndo, public SwUndRng
{
OUString sTableNm;
- SwInsertTableOptions const aInsTableOpts;
+ SwInsertTableOptions aInsTableOpts;
std::vector<sal_uLong> mvDelBoxes;
std::unique_ptr<SwTableAutoFormat> pAutoFormat;
SwHistory* pHistory;
- sal_Unicode const cSeparator;
- sal_uInt16 const nAdjust;
+ sal_Unicode cSeparator;
+ sal_uInt16 nAdjust;
bool bSplitEnd : 1;
public:
@@ -98,14 +98,14 @@ public:
class SwUndoTableToText : public SwUndo
{
- OUString const sTableNm;
+ OUString sTableNm;
std::unique_ptr<SwDDEFieldType> pDDEFieldType;
std::unique_ptr<SaveTable> pTableSave;
SwTableToTextSaves m_vBoxSaves;
std::unique_ptr<SwHistory> pHistory;
sal_uLong nSttNd, nEndNd;
- sal_Unicode const cSeparator;
- sal_uInt16 const nHdlnRpt;
+ sal_Unicode cSeparator;
+ sal_uInt16 nHdlnRpt;
bool bCheckNumFormat : 1;
public:
@@ -146,7 +146,7 @@ class SwUndoTableAutoFormat : public SwUndo
std::unique_ptr<SaveTable> m_pSaveTable;
std::vector< std::shared_ptr<SwUndoTableNumFormat> > m_Undos;
bool m_bSaveContentAttr;
- sal_uInt16 const m_nRepeatHeading;
+ sal_uInt16 m_nRepeatHeading;
void UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext);
@@ -170,7 +170,7 @@ class SwUndoTableNdsChg : public SwUndo
struct BoxMove
{
sal_uLong index; ///< Index of this box.
- bool const hasMoved; ///< Has this box been moved already.
+ bool hasMoved; ///< Has this box been moved already.
BoxMove(sal_uLong idx, bool moved=false) : index(idx), hasMoved(moved)
{};
bool operator<(const BoxMove& other) const { return index <
other.index; };
};
@@ -179,8 +179,8 @@ class SwUndoTableNdsChg : public SwUndo
long m_nMin, m_nMax; // for redo of delete column
sal_uLong m_nSttNode;
sal_uInt16 m_nCount;
- bool const m_bFlag;
- bool const m_bSameHeight; // only used for SplitRow
+ bool m_bFlag;
+ bool m_bSameHeight; // only used for SplitRow
SwUndoTableNdsChg(SwUndoTableNdsChg const&) = delete;
SwUndoTableNdsChg& operator=(SwUndoTableNdsChg const&) = delete;
@@ -314,7 +314,7 @@ class SwUndoSplitTable : public SwUndo
std::unique_ptr<SwHistory> m_pHistory;
SplitTable_HeadlineOption const m_nMode;
sal_uInt16 m_nFormulaEnd;
- bool const m_bCalcNewSize;
+ bool m_bCalcNewSize;
public:
SwUndoSplitTable( const SwTableNode& rTableNd,
std::unique_ptr<SwSaveRowSpan> pRowSp,
@@ -337,8 +337,8 @@ class SwUndoMergeTable : public SwUndo
sal_uLong m_nTableNode;
std::unique_ptr<SaveTable> m_pSaveTable, m_pSaveHdl;
std::unique_ptr<SwHistory> m_pHistory;
- sal_uInt16 const m_nMode;
- bool const m_bWithPrev;
+ sal_uInt16 m_nMode;
+ bool m_bWithPrev;
public:
SwUndoMergeTable( const SwTableNode& rTableNd, const SwTableNode&
rDelTableNd,
@@ -356,8 +356,8 @@ public:
class SwUndoTableHeadline : public SwUndo
{
sal_uLong nTableNd;
- sal_uInt16 const nOldHeadline;
- sal_uInt16 const nNewHeadline;
+ sal_uInt16 nOldHeadline;
+ sal_uInt16 nNewHeadline;
public:
SwUndoTableHeadline( const SwTable&, sal_uInt16 nOldHdl, sal_uInt16
nNewHdl );
@@ -371,7 +371,7 @@ void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16
nIdx );
class SwUndoTableStyleMake : public SwUndo
{
- OUString const m_sName;
+ OUString m_sName;
std::unique_ptr<SwTableAutoFormat> m_pAutoFormat;
public:
SwUndoTableStyleMake(const OUString& rName, const SwDoc* pDoc);
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index 8808b47702d3..2f270f1884d1 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -92,12 +92,12 @@ public:
class SwAutoCorrExceptWord
{
- OUString const m_sWord;
- ACFlags const m_nFlags;
- sal_uLong const m_nNode;
- sal_Int32 const m_nContent;
- sal_Unicode const m_cChar;
- LanguageType const m_eLanguage;
+ OUString m_sWord;
+ ACFlags m_nFlags;
+ sal_uLong m_nNode;
+ sal_Int32 m_nContent;
+ sal_Unicode m_cChar;
+ LanguageType m_eLanguage;
bool m_bDeleted;
public:
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index c9a9f51a2d7d..61c45fda8044 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -36,7 +36,7 @@ class SwBlinkPortion
Point aPos;
const SwLinePortion *pPor;
const SwRootFrame *pFrame;
- sal_uInt16 const nDir;
+ sal_uInt16 nDir;
public:
SwBlinkPortion(const SwLinePortion* pPortion, sal_uInt16 nDirection)
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 4bfdfc3143a8..a660ba4cbae0 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -99,7 +99,7 @@ private:
// sort text
struct SwSortTextElement : public SwSortElement
{
- sal_uLong const nOrg;
+ sal_uLong nOrg;
SwNodeIndex aPos;
SwSortTextElement( const SwNodeIndex& rPos );
@@ -110,7 +110,7 @@ struct SwSortTextElement : public SwSortElement
// sort table
struct SwSortBoxElement : public SwSortElement
{
- sal_uInt16 const nRow;
+ sal_uInt16 nRow;
SwSortBoxElement( sal_uInt16 nRC );
diff --git a/sw/source/core/inc/fieldhint.hxx b/sw/source/core/inc/fieldhint.hxx
index 2aca032e728a..929d6ea19587 100644
--- a/sw/source/core/inc/fieldhint.hxx
+++ b/sw/source/core/inc/fieldhint.hxx
@@ -28,8 +28,8 @@ class SwRootFrame;
class SwFieldHint : public SfxHint
{
public:
- SwPaM* const m_pPaM;
- SwRootFrame const*const m_pLayout;
+ SwPaM* m_pPaM;
+ SwRootFrame const* m_pLayout;
SwFieldHint(SwPaM *const pPaM, SwRootFrame const*const pLayout)
: m_pPaM(pPaM)
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index b394682307b5..f908ed62ec0d 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -90,7 +90,7 @@ class SwFntObj : public SwCacheObj
sal_uInt16 m_nPrtAscent;
sal_uInt16 m_nScrHeight;
sal_uInt16 m_nPrtHeight;
- sal_uInt16 const m_nPropWidth;
+ sal_uInt16 m_nPropWidth;
sal_uInt16 m_nZoom;
bool m_bSymbol : 1;
bool m_bPaintBlank : 1;
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index c070ed2bf28c..ddb7bea2dd38 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -229,7 +229,7 @@ protected:
SwTwips mnFlyAnchorOfstNoWrap;
bool mbHadFollow;
bool mbInvaKeep;
- bool const mbValidSize;
+ bool mbValidSize;
public:
SwFrameNotify( SwFrame *pFrame );
@@ -253,7 +253,7 @@ public:
class SwFlyNotify : public SwLayNotify
{
- SwPageFrame * const pOldPage;
+ SwPageFrame *pOldPage;
const SwRect aFrameAndSpace;
public:
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index a509ea02b3a1..63b633946911 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -56,10 +56,10 @@ namespace sw { namespace mark
const SwIndex* pIdx =nullptr);
private:
- OUString const m_aName;
+ OUString m_aName;
OUString m_aShortName;
vcl::KeyCode m_aCode;
- IDocumentMarkAccess::MarkType const m_eOrigBkmType;
+ IDocumentMarkAccess::MarkType m_eOrigBkmType;
sal_uLong m_nNode1;
sal_uLong m_nNode2;
sal_Int32 m_nContent1;
@@ -98,10 +98,10 @@ void DelBookmarks(const SwNodeIndex& rStt,
* location. */
struct SaveFly
{
- sal_uLong const nNdDiff; /// relative node difference
- sal_Int32 const nContentIndex; ///< index in node
- SwFrameFormat* const pFrameFormat; /// the fly's frame format
- bool const isAtInsertNode; ///< if true, anchor _at_ insert node index
+ sal_uLong nNdDiff; /// relative node difference
+ sal_Int32 nContentIndex; ///< index in node
+ SwFrameFormat* pFrameFormat; /// the fly's frame format
+ bool isAtInsertNode; ///< if true, anchor _at_ insert node index
SaveFly( sal_uLong nNodeDiff, sal_Int32 const nCntntIdx, SwFrameFormat*
pFormat, bool bInsert )
: nNdDiff(nNodeDiff)
@@ -186,7 +186,7 @@ class SaveRedlEndPosForRestore
{
std::vector<SwPosition*> mvSavArr;
std::unique_ptr<SwNodeIndex> mpSaveIndex;
- sal_Int32 const mnSaveContent;
+ sal_Int32 mnSaveContent;
public:
SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nContent );
diff --git a/sw/source/core/inc/pagedeschint.hxx
b/sw/source/core/inc/pagedeschint.hxx
index 1cdca3f111de..d76aa95d3e70 100644
--- a/sw/source/core/inc/pagedeschint.hxx
+++ b/sw/source/core/inc/pagedeschint.hxx
@@ -26,7 +26,7 @@ class SwPageDesc;
class SwPageDescHint : public SfxHint
{
- SwPageDesc* const pPageDesc;
+ SwPageDesc* pPageDesc;
public:
SwPageDescHint( SwPageDesc* p )
: pPageDesc(p)
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 2abe1d590b88..f473ad63b753 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -117,8 +117,8 @@ class SwHistorySetText : public SwHistoryHint
const sal_uLong m_nNodeIndex;
const sal_Int32 m_nStart;
const sal_Int32 m_nEnd;
- bool const m_bFormatIgnoreStart : 1;
- bool const m_bFormatIgnoreEnd : 1;
+ bool m_bFormatIgnoreStart : 1;
+ bool m_bFormatIgnoreEnd : 1;
public:
SwHistorySetText( SwTextAttr* pTextHt, sal_uLong nNode );
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 05d081019e67..7a53fc1afaf5 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -441,7 +441,7 @@ class DisableCallbackAction
{
private:
SwRootFrame & m_rRootFrame;
- bool const m_bOldCallbackActionState;
+ bool m_bOldCallbackActionState;
public:
explicit DisableCallbackAction(SwRootFrame & rRootFrame)
diff --git a/sw/source/core/inc/scriptinfo.hxx
b/sw/source/core/inc/scriptinfo.hxx
index bb91dedea1a7..ead531c5c0c3 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -59,8 +59,8 @@ private:
//! Records a single change in direction.
struct DirectionChangeInfo
{
- TextFrameIndex const position; //!< Character position at which we
change direction.
- sal_uInt8 const type; //!< Direction that we change to.
+ TextFrameIndex position; //!< Character position at which we change
direction.
+ sal_uInt8 type; //!< Direction that we change to.
DirectionChangeInfo(TextFrameIndex pos, sal_uInt8 typ) :
position(pos), type(typ) {};
};
std::vector<DirectionChangeInfo> m_DirectionChanges;
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 620080e8b654..3cc65c48439a 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -36,9 +36,9 @@ class SwBlockName
friend class SwImpBlocks;
sal_uInt16 nHashS, nHashL; // Hash codes for testing
public:
- OUString const aShort; /// Shortname
+ OUString aShort; /// Shortname
OUString aLong; /// Longname
- OUString const aPackageName; /// Package name
+ OUString aPackageName; /// Package name
bool bIsOnlyTextFlagInit : 1; /// Is the Flag valid?
bool bIsOnlyText : 1; /// Unformatted text
@@ -55,7 +55,7 @@ class SwImpBlocks
{
friend class SwTextBlocks;
protected:
- OUString const m_aFile; // Physical file name
+ OUString m_aFile; // Physical file name
OUString m_aName; // Logical file name
OUString m_aCurrentText; // Current text
OUString m_aShort, m_aLong; // Short- and longname (PutDoc)
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index 585ef97d9e80..ebe64d841feb 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -62,7 +62,7 @@ public:
class SwFontAccess : public SwCacheAccess
{
- SwViewShell * const m_pShell;
+ SwViewShell *m_pShell;
protected:
virtual SwCacheObj *NewObj( ) override;
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 7603efb463a2..a2f38ed1406a 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -957,7 +957,7 @@ inline void SwFont::SetHighlightColor( const Color&
aNewColor )
class SwUnderlineFont
{
Point m_aPos;
- TextFrameIndex const m_nEnd;
+ TextFrameIndex m_nEnd;
std::unique_ptr<SwFont> m_pFont;
public:
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 5200f39e8017..8d78bae0051d 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -63,7 +63,7 @@ class SwCollectTableLineBoxes
std::vector<sal_uInt16> aPosArr;
std::vector<SwTableBox*> m_Boxes;
SwHistory* pHst;
- SplitTable_HeadlineOption const nMode;
+ SplitTable_HeadlineOption nMode;
sal_uInt16 nWidth;
bool bGetFromTop : 1;
bool bGetValues : 1;
@@ -110,7 +110,7 @@ void sw_BoxSetSplitBoxFormats( SwTableBox* pBox,
SwCollectTableLineBoxes* pSplPa
*/
struct SwSaveRowSpan
{
- sal_uInt16 const mnSplitLine; // the line number where the table has been
split
+ sal_uInt16 mnSplitLine; // the line number where the table has been split
std::vector< long > mnRowSpans; // the row span attributes in this line
SwSaveRowSpan( SwTableBoxes& rBoxes, sal_uInt16 nSplitLn );
};
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index df88a60a25e5..b7772a5b1135 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -46,8 +46,8 @@ enum TOXSortType
struct SwTOXSource
{
const SwContentNode* pNd;
- sal_Int32 const nPos;
- bool const bMainEntry;
+ sal_Int32 nPos;
+ bool bMainEntry;
SwTOXSource( const SwContentNode* pNode, sal_Int32 n, bool bMain )
: pNd(pNode), nPos(n), bMainEntry(bMain)
@@ -72,9 +72,9 @@ class SwTOXInternational
{
std::unique_ptr<IndexEntrySupplierWrapper> m_pIndexWrapper;
std::unique_ptr<CharClass> m_pCharClass;
- LanguageType const m_eLang;
- OUString m_sSortAlgorithm;
- SwTOIOptions const m_nOptions;
+ LanguageType m_eLang;
+ OUString m_sSortAlgorithm;
+ SwTOIOptions m_nOptions;
void Init();
@@ -129,7 +129,7 @@ struct SwTOXSortTabBase
const SwTOXInternational* pTOXIntl;
sal_uLong nPos;
sal_Int32 nCntPos;
- sal_uInt16 const nType;
+ sal_uInt16 nType;
static SwTOIOptions nOpt;
SwTOXSortTabBase( TOXSortType nType,
@@ -202,7 +202,7 @@ struct SwTOXIndex : public SwTOXSortTabBase
private:
virtual TextAndReading GetText_Impl(SwRootFrame const* pLayout) const
override;
- sal_uInt8 const nKeyLevel;
+ sal_uInt8 nKeyLevel;
};
struct SwTOXCustom : public SwTOXSortTabBase
@@ -218,8 +218,8 @@ struct SwTOXCustom : public SwTOXSortTabBase
private:
virtual TextAndReading GetText_Impl(SwRootFrame const* pLayout) const
override;
- TextAndReading const m_aKey;
- sal_uInt16 const nLev;
+ TextAndReading m_aKey;
+ sal_uInt16 nLev;
};
/**
@@ -256,11 +256,11 @@ struct SwTOXPara : public SwTOXSortTabBase
private:
virtual TextAndReading GetText_Impl(SwRootFrame const* pLayout) const
override;
- SwTOXElement const eType;
- sal_uInt16 const m_nLevel;
+ SwTOXElement eType;
+ sal_uInt16 m_nLevel;
sal_Int32 nStartIndex;
sal_Int32 nEndIndex;
- OUString const m_sSequenceName;
+ OUString m_sSequenceName;
};
struct SwTOXTable : public SwTOXSortTabBase
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index b234e242ba59..a1a7833e21a3 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -932,7 +932,7 @@ public:
class SwLayoutModeModifier
{
const OutputDevice& m_rOut;
- ComplexTextLayoutFlags const m_nOldLayoutMode;
+ ComplexTextLayoutFlags m_nOldLayoutMode;
public:
SwLayoutModeModifier( const OutputDevice& rOutp );
~SwLayoutModeModifier();
@@ -943,7 +943,7 @@ public:
class SwDigitModeModifier
{
const OutputDevice& rOut;
- LanguageType const nOldLanguageType;
+ LanguageType nOldLanguageType;
public:
SwDigitModeModifier( const OutputDevice& rOutp, LanguageType eCurLang );
~SwDigitModeModifier();
diff --git a/sw/source/core/inc/unobookmark.hxx
b/sw/source/core/inc/unobookmark.hxx
index 297cd5a4ccfb..f277748b5d7e 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -183,7 +183,7 @@ class SwXFieldmark final
: public SwXFieldmark_Base
{
::sw::mark::ICheckboxFieldmark* getCheckboxFieldmark();
- bool const m_bReplacementObject;
+ bool m_bReplacementObject;
SwXFieldmark(bool isReplacementObject, SwDoc* pDoc);
diff --git a/sw/source/core/inc/unoflatpara.hxx
b/sw/source/core/inc/unoflatpara.hxx
index b59c03a9246a..2587b6ff2d47 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -109,7 +109,7 @@ private:
SwXFlatParagraph( const SwXFlatParagraph & ) = delete;
SwXFlatParagraph & operator = ( const SwXFlatParagraph & ) = delete;
- OUString const maExpandText;
+ OUString maExpandText;
};
class SwXFlatParagraphIterator:
diff --git a/sw/source/core/layout/dbg_lay.cxx
b/sw/source/core/layout/dbg_lay.cxx
index 2da3f1368809..e67428eb010f 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -166,9 +166,9 @@ class SwImplEnterLeave
{
protected:
const SwFrame* pFrame; // the frame
- PROT const nFunction; // the function
- DbgAction const nAction; // the action if needed
- void* const pParam; // further parameter
+ PROT nFunction; // the function
+ DbgAction nAction; // the action if needed
+ void* pParam; // further parameter
public:
SwImplEnterLeave( const SwFrame* pF, PROT nFunct, DbgAction nAct, void*
pPar )
: pFrame( pF ), nFunction( nFunct ), nAction( nAct ), pParam( pPar ) {}
diff --git a/sw/source/core/layout/layhelp.hxx
b/sw/source/core/layout/layhelp.hxx
index 0f39b1b0cd00..d7ebd30b3323 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -83,8 +83,8 @@ public:
// by controlling nested sections.
class SwActualSection
{
- SwActualSection * const pUpper;
- SwSectionFrame *pSectFrame;
+ SwActualSection *pUpper;
+ SwSectionFrame *pSectFrame;
SwSectionNode *pSectNode;
public:
SwActualSection( SwActualSection *pUpper,
@@ -145,8 +145,8 @@ class SwLayCacheIoImpl
{
private:
struct RecTypeSize {
- sal_uInt8 const type;
- sal_uLong const size;
+ sal_uInt8 type;
+ sal_uLong size;
RecTypeSize(sal_uInt8 typ, sal_uLong siz) : type(typ), size(siz) {}
};
std::vector<RecTypeSize> aRecords;
@@ -158,7 +158,7 @@ private:
sal_uInt16 nMajorVersion;
sal_uInt16 nMinorVersion;
- bool const bWriteMode : 1;
+ bool bWriteMode : 1;
bool bError : 1;
public:
@@ -205,8 +205,8 @@ public:
class SwFlyCache : public SwRect // position and size
{
public:
- sal_uLong const nOrdNum; ///< Id to recognize text frames
- sal_uInt16 const nPageNum; ///< page number
+ sal_uLong nOrdNum; ///< Id to recognize text frames
+ sal_uInt16 nPageNum; ///< page number
SwFlyCache( sal_uInt16 nP, sal_uLong nO, long nXL, long nYL, long nWL,
long nHL ) :
SwRect( nXL, nYL, nWL, nHL ), nOrdNum( nO ), nPageNum( nP ){}
};
diff --git a/sw/source/core/layout/layouter.cxx
b/sw/source/core/layout/layouter.cxx
index dbb5757bbd1b..0ae6585702eb 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -46,7 +46,7 @@ public:
class SwEndnoter
{
- SwLayouter* const pMaster;
+ SwLayouter* pMaster;
SwSectionFrame* pSect;
std::unique_ptr<SwFootnoteFrames> pEndArr;
public:
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx
b/sw/source/core/layout/objectformattertxtfrm.hxx
index cf3b955addb1..15667b9ead60 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.hxx
@@ -34,7 +34,7 @@ class SwObjectFormatterTextFrame : public SwObjectFormatter
SwTextFrame& mrAnchorTextFrame;
// 'master' anchor text frame
- SwTextFrame* const mpMasterAnchorTextFrame;
+ SwTextFrame* mpMasterAnchorTextFrame;
SwObjectFormatterTextFrame( SwTextFrame& _rAnchorTextFrame,
const SwPageFrame& _rPageFrame,
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index eee4a37cb685..fb43bc87f831 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4518,13 +4518,13 @@ namespace drawinglayer::primitive2d
{
private:
/// the transformation defining the geometry of this
BorderRectangle
- basegfx::B2DHomMatrix const maB2DHomMatrix;
+ basegfx::B2DHomMatrix maB2DHomMatrix;
/// the four styles to be used
- svx::frame::Style const maStyleTop;
- svx::frame::Style const maStyleRight;
- svx::frame::Style const maStyleBottom;
- svx::frame::Style const maStyleLeft;
+ svx::frame::Style maStyleTop;
+ svx::frame::Style maStyleRight;
+ svx::frame::Style maStyleBottom;
+ svx::frame::Style maStyleLeft;
protected:
/// local decomposition.
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 064f62c9f153..81e67503d3fb 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -301,7 +301,7 @@ class SwHookOut
{
SwTextSizeInfo* pInf;
VclPtr<OutputDevice> pOut;
- bool const bOnWin;
+ bool bOnWin;
public:
explicit SwHookOut( SwTextSizeInfo& rInfo );
~SwHookOut();
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 96ba5aed876d..c8948197fe45 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -35,7 +35,7 @@ class SwDropPortionPart
{
std::unique_ptr<SwDropPortionPart> pFollow;
std::unique_ptr<SwFont> pFnt;
- TextFrameIndex const nLen;
+ TextFrameIndex nLen;
sal_uInt16 nWidth;
bool m_bJoinBorderWithNext;
bool m_bJoinBorderWithPrev;
@@ -64,7 +64,7 @@ class SwDropPortion : public SwTextPortion
std::unique_ptr<SwDropPortionPart> pPart; // due to script/attribute
changes
sal_uInt16 nLines; // Line count
sal_uInt16 nDropHeight; // Height
- sal_uInt16 const nDropDescent; // Distance to the next line
+ sal_uInt16 nDropDescent; // Distance to the next line
sal_uInt16 nDistance; // Distance to the text
sal_uInt16 nFix; // Fixed position
short nY; // Y Offset
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 22a8aef317ba..418e6ff3c78d 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -39,7 +39,7 @@ public:
class SwBlankPortion : public SwExpandPortion
{
sal_Unicode m_cChar;
- bool const m_bMulti; // For multiportion brackets
+ bool m_bMulti; // For multiportion brackets
public:
SwBlankPortion( sal_Unicode cCh, bool bMult = false )
: m_cChar( cCh ), m_bMulti( bMult )
@@ -59,7 +59,7 @@ public:
class SwPostItsPortion : public SwExpandPortion
{
- bool const bScript;
+ bool bScript;
public:
explicit SwPostItsPortion( bool bScrpt );
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 2c87ed1ef25c..afc7c6bbf83b 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -121,8 +121,8 @@ class SwNumberPortion : public SwFieldPortion
{
protected:
sal_uInt16 nFixWidth; // See Glues
- sal_uInt16 const nMinDist; // Minimal distance to the text
- bool const mbLabelAlignmentPosAndSpaceModeActive;
+ sal_uInt16 nMinDist; // Minimal distance to the text
+ bool mbLabelAlignmentPosAndSpaceModeActive;
public:
SwNumberPortion( const OUString &rExpand,
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 5c6ea9a68616..181d77a642f3 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -25,7 +25,7 @@ class SwTextFootnote;
class SwFootnotePortion : public SwFieldPortion
{
- SwTextFootnote * const pFootnote;
+ SwTextFootnote *pFootnote;
sal_uInt16 nOrigHeight;
// #i98418#
bool mbPreferredScriptTypeSet;
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 3ed5cf12da9f..57f685abe2dc 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -37,7 +37,7 @@ public:
class SwHyphStrPortion : public SwHyphPortion
{
- OUString const aExpand;
+ OUString aExpand;
public:
explicit SwHyphStrPortion(const OUString &rStr)
: aExpand(rStr + "-")
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index b78dc6258f6b..8a0d352dfa9a 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -216,7 +216,7 @@ public:
class SwBidiPortion : public SwMultiPortion
{
- sal_uInt8 const nLevel;
+ sal_uInt8 nLevel;
public:
SwBidiPortion(TextFrameIndex nEnd, sal_uInt8 nLv);
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index 623849c15453..3d4c54c7ecd8 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -62,9 +62,9 @@ public:
class SwKernPortion : public SwLinePortion
{
- short const nKern;
- bool const bBackground;
- bool const bGridKern;
+ short nKern;
+ bool bBackground;
+ bool bGridKern;
public:
@@ -87,7 +87,7 @@ public:
class SwArrowPortion : public SwLinePortion
{
Point aPos;
- bool const bLeft;
+ bool bLeft;
public:
explicit SwArrowPortion( const SwLinePortion &rPortion );
explicit SwArrowPortion( const SwTextPaintInfo &rInf );
@@ -103,7 +103,7 @@ public:
// The SwHangingPortion is the corresponding textportion to do that.
class SwHangingPortion : public SwTextPortion
{
- sal_uInt16 const nInnerWidth;
+ sal_uInt16 nInnerWidth;
public:
explicit SwHangingPortion( SwPosSize aSize ) : nInnerWidth( aSize.Width() )
{
@@ -135,7 +135,7 @@ private:
mutable sal_uInt16 mnViewWidth; // used to cache a calculated
value
mutable sal_uInt16 mnHalfCharWidth; // used to cache a calculated
value
protected:
- sal_Unicode const mcChar;
+ sal_Unicode mcChar;
public:
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 34662b3d4237..274e8c39d0df 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -68,10 +68,10 @@ namespace {
class SwDropSave
{
SwTextPaintInfo* pInf;
- sal_Int32 const nIdx;
- sal_Int32 const nLen;
- long const nX;
- long const nY;
+ sal_Int32 nIdx;
+ sal_Int32 nLen;
+ long nX;
+ long nY;
public:
explicit SwDropSave( const SwTextPaintInfo &rInf );
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 47bc91729b0b..ac0892f81bd3 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -61,7 +61,7 @@ namespace
// #i68520#
struct AnchoredObjOrder
{
- bool const mbR2L;
+ bool mbR2L;
SwRectFn mfnRect;
AnchoredObjOrder( const bool bR2L,
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 5c2cdbed53da..b551c28422b0 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -32,7 +32,7 @@ namespace {
class XmlPortionDumper:public SwPortionHandler
{
private:
- xmlTextWriterPtr const writer;
+ xmlTextWriterPtr writer;
TextFrameIndex ofs;
const OUString& m_rText;
OUString m_aLine;
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index e62f8d1fb6eb..10d42cc89a60 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -742,8 +742,8 @@ static FormTokenType lcl_GetTokenType(const OUString &
sToken,
{
static struct
{
- OUString const sTokenStart;
- sal_Int16 const nTokenLength;
+ OUString sTokenStart;
+ sal_Int16 nTokenLength;
FormTokenType eTokenType;
} const aTokenArr[] = {
{ SwForm::GetFormTab().copy(0, 2), 3, TOKEN_TAB_STOP },
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 55968e13fdd9..d105736ad5ff 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -248,12 +248,12 @@ struct CalcLinePosData
{
SwDrawTextInfo& rInf;
vcl::Font& rFont;
- TextFrameIndex const nCnt;
+ TextFrameIndex nCnt;
const bool bSwitchH2V;
const bool bSwitchH2VLRBT;
const bool bSwitchL2R;
- long const nHalfSpace;
- long* const pKernArray;
+ long nHalfSpace;
+ long* pKernArray;
const bool bBidiPor;
CalcLinePosData( SwDrawTextInfo& _rInf, vcl::Font& _rFont,
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx
b/sw/source/core/txtnode/modeltoviewhelper.cxx
index f7be7f8a98bb..4675a632a065 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -38,7 +38,7 @@ namespace {
struct FieldResult
{
- sal_Int32 const m_nFieldPos;
+ sal_Int32 m_nFieldPos;
OUString m_sExpand;
enum { NONE, FIELD, FOOTNOTE } m_eType;
explicit FieldResult(sal_Int32 const nPos)
@@ -63,9 +63,9 @@ namespace {
struct block
{
- sal_Int32 const m_nStart;
- sal_Int32 const m_nLen;
- bool const m_bVisible;
+ sal_Int32 m_nStart;
+ sal_Int32 m_nLen;
+ bool m_bVisible;
FieldResultSet m_aAttrs;
block(sal_Int32 nStart, sal_Int32 nLen, bool bVisible)
: m_nStart(nStart), m_nLen(nLen), m_bVisible(bVisible)
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 10ca3470938d..6fb4e82fae56 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -479,11 +479,11 @@ class SwUndoReplace::Impl
: private SwUndoSaveContent
{
OUString m_sOld;
- OUString const m_sIns;
+ OUString m_sIns;
sal_uLong m_nSttNd, m_nEndNd, m_nOffset;
sal_Int32 m_nSttCnt, m_nEndCnt, m_nSetPos, m_nSelEnd;
bool m_bSplitNext : 1;
- bool const m_bRegExp : 1;
+ bool m_bRegExp : 1;
// metadata references for paragraph and following para (if m_bSplitNext)
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 0fc1ee2d3100..7361da5a4930 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -323,7 +323,7 @@ SwRewriter SwUndoOverwrite::GetRewriter() const
struct UndoTransliterate_Data
{
- OUString const sText;
+ OUString sText;
std::unique_ptr<SwHistory> pHistory;
std::unique_ptr<Sequence< sal_Int32 >> pOffsets;
sal_uLong nNdIdx;
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index de72ebd85457..0251de1591d8 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -106,9 +106,9 @@ class SaveTable
const SwTable* m_pSwTable;
SfxItemSets m_aSets;
SwFrameFormatsV m_aFrameFormats;
- sal_uInt16 const m_nLineCount;
+ sal_uInt16 m_nLineCount;
bool m_bModifyBox : 1;
- bool const m_bSaveFormula : 1;
+ bool m_bSaveFormula : 1;
bool m_bNewModel : 1;
SaveTable(const SaveTable&) = delete;
@@ -194,9 +194,9 @@ So we need to remember not only the start node position but
the end node positio
struct SwTableToTextSave
{
- sal_uLong const m_nSttNd;
+ sal_uLong m_nSttNd;
sal_uLong m_nEndNd;
- sal_Int32 const m_nContent;
+ sal_Int32 m_nContent;
std::unique_ptr<SwHistory> m_pHstry;
// metadata references for first and last paragraph in cell
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
@@ -2189,7 +2189,7 @@ namespace {
class RedlineFlagsInternGuard
{
SwDoc& mrDoc;
- RedlineFlags const meOldRedlineFlags;
+ RedlineFlags meOldRedlineFlags;
public:
RedlineFlagsInternGuard(
diff --git a/sw/source/core/unocore/unocoll.cxx
b/sw/source/core/unocore/unocoll.cxx
index e02a2fa945e2..9965a5b9ca8e 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -84,7 +84,7 @@ namespace {
class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper<
document::XCodeNameQuery >
{
- SwDocShell* const mpDocShell;
+ SwDocShell* mpDocShell;
OUString msThisDocumentCodeName;
public:
explicit SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell(
pDocShell ) {}
@@ -223,7 +223,7 @@ public:
class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper<
container::XNameAccess >
{
- SwDocShell* const mpDocShell;
+ SwDocShell* mpDocShell;
public:
explicit SwVbaObjectForCodeNameProvider( SwDocShell* pDocShell ) :
mpDocShell( pDocShell )
{
@@ -271,7 +271,7 @@ namespace {
struct ProvNamesId_Type
{
const char * pName;
- SwServiceType const nType;
+ SwServiceType nType;
};
}
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index f26ac1dde4aa..8bf844d4ba9f 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -77,7 +77,7 @@ using namespace ::com::sun::star;
class SwShapeDescriptor_Impl
{
- bool const m_isInReading;
+ bool m_isInReading;
std::unique_ptr<SwFormatHoriOrient> m_pHOrient;
std::unique_ptr<SwFormatVertOrient> m_pVOrient;
std::unique_ptr<SwFormatAnchor> m_pAnchor;
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 5460099da890..d6c9e5a926fd 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -118,8 +118,8 @@ namespace {
struct ServiceIdResId
{
- SwFieldIds const nResId;
- SwServiceType const nServiceId;
+ SwFieldIds nResId;
+ SwServiceType nServiceId;
};
}
@@ -413,7 +413,7 @@ public:
SwDoc* m_pDoc;
SwFieldType* m_pType;
- SwFieldIds const m_nResTypeId;
+ SwFieldIds m_nResTypeId;
OUString m_sParam1; // Content / Database / NumberingSeparator
OUString m_sParam2; // - /DataTablename
@@ -1100,7 +1100,7 @@ public:
rtl::Reference<SwTextAPIObject> m_xTextObject;
bool m_bIsDescriptor;
bool m_bCallUpdate;
- SwServiceType const m_nServiceId;
+ SwServiceType m_nServiceId;
OUString m_sTypeName;
std::unique_ptr<SwFieldProperties_Impl> m_pProps;
diff --git a/sw/source/core/unocore/unoidx.cxx
b/sw/source/core/unocore/unoidx.cxx
index fbb5373f0235..82e42e167ce9 100644
--- a/sw/source/core/unocore/unoidx.cxx
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
