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.grandin@collabora.co.uk>
diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx
index 590c9a7..84cf1ad 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 d9796a2..95ee851 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 aa4273d..64a34b8 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 6c0b24d..221ef2a 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 de8618c..2b323e6 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 a5e7fe5..ecf2fac 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 662bc6c..8382e96 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 3ce90f8..8d02773 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 ff60815..8f56624 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 7d1c64f..32c2099 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 59716f0..9f33fee 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 9fcbb5d..9f45f05 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 933f751..6aa5867 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 91938eb..5b62429 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 989f9af..e53c537b 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 f951fb2..5282f68 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 9f2aa0d..1641c6f 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 ede55a4..78b62b4 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 bf3fef1..86e33f4 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 b4d94c5..29eafc1 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 7d7dcd7..845e98d 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 f1965ac..03f3ab7 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 5fd4212..5c8187d 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 53b91f4..f19687c 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 18ae54c..95673e6 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 1cd3b0f..10c4faa 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 1314577..1f26be5 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 08b4d11..1a9e634 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 a7f9fa8..d739925 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 0c79484..a7971be 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 f43fd0c..55d0f99 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 d627eda..1787477 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 bb322c4..9a79579 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 88b9839..8ed20b8 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 58b721a..7020bd4 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 7ca5397..d9d32a8 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 36ce909..36d6e94 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 8d8c77d..c5044e1 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 40eb643..41a2835e 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 5bbccc8..e75ad1aa 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 a55e38e..080fb97 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 85b18b0..ef81f1a 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 2475470..ee502b5 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 616ae10..0fc4023 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 e257773..0a6b65a 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 05115ed..de273d6 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 0639db3..e7ef81b 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 b6cfb32..eed9e67 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 8cf7eca..76a865c 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 80f90e3..8da9b70 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 196e3f3..b085aaa 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 f8b9f42..dc36615 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 058812c..4e8fee3 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 4952c6f..59b8595 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 8550430..4915305 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 0c33b70..ed4ecaf 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 fdbc714..68116d9 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 ba71be7..da08526 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 4eee915..b2e2e5663 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 d3cf02d..14cd019 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 a917580..2311cf8d 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 29ff1e4..0619327 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 0f8d83f..eecda92 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 049cf92..95e928df 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 bd36e45..98fbca5 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 9176421..db49e53 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 34334242..91f14c1 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 f3de5d3..016a384 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 2a6f805..bd952576 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 692d600..f791e7d 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 f98197af..e314e0f 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 3c8ffe8..4d12c2d 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 6a8e01383..4d5469e 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 4bf6841..b23324a 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 d9ec3aa..a62f55e 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 a0a43a7..21078e7 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 295e7e2..4d077fe 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 6ffe0c8..a59a0eb 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 552a61f..905bc8f 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 79a8911..48d8f6b 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 3de78a1..cfc2f50 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 7015e3f..a86e30c 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 2049d8b..c99939a 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 d85c054..bf9e014 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 1e62a0a..801997d 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 9490f51..70e6149 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 0fe66a6..1a21a87 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 38ecd86..3450b23d 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 7dfab2f..ad779ee 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 efca52b..27f6c5d 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 8808b47..2f270f1 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 c9a9f51..61c45fd 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 4bfdfc3..a660ba4 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 2aca032..929d6ea 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 b394682..f908ed6 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 c070ed2..ddb7bea 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 a509ea0..63b6339 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 1cdca3f..d76aa95 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 2abe1d5..f473ad6 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 05d0810..7a53fc1 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 bb91ded..ead531c5 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 620080e..3cc65c4 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 585ef97..ebe64d84 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 7603efb..a2f38ed 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 5200f39..8d78bae 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 df88a60a..b7772a5 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 b234e24..a1a7833 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 297cd5a..f277748 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 b59c03a..2587b6f 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 2da3f13..e67428e 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 0f39b1b..d7ebd30 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 dbb5757..0ae6585 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 cf3b955..15667b9 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 eee4a37..fb43bc8 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 064f62c..81e6750 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 96ba5ae..c894819 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 22a8aef..418e6ff 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 2c87ed1..afc7c6b 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 5c6ea9a..181d77a 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 3ed5cf1..57f685a 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 b78dc62..8a0d352 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 623849c..3d4c54c 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 34662b3..274e8c3 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 47bc917..ac0892f 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 5c2cdbe..b551c28 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 e62f8d1..10d42cc 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 55968e1..d105736 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 f7be7f8..4675a63 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 10ca347..6fb4e82 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 0fc1ee2..7361da5 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 de72ebd..0251de1 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 e02a2fa..9965a5b 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 f26ac1d..8bf844d 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 5460099..d6c9e5a 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 fbb5373..82e42e1 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -2645,7 +2645,7 @@ namespace {
struct TokenType_ {
const char *pName;
enum FormTokenType const eTokenType;
enum FormTokenType eTokenType;
};
}
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 2d3e339..d10a195 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -120,8 +120,8 @@ public:
::comphelper::OInterfaceContainerHelper2 m_EventListeners;
SfxItemPropertySet const& m_rPropSet;
bool m_bIsDescriptor;
sal_Int32 const m_nSelectionStartPos;
sal_Int32 const m_nSelectionEndPos;
sal_Int32 m_nSelectionStartPos;
sal_Int32 m_nSelectionEndPos;
OUString m_sText;
uno::Reference<text::XText> m_xParentText;
SwTextNode* m_pTextNode;
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index cea5fec..8b968bb 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -87,7 +87,7 @@ namespace
struct SwXBookmarkPortion_Impl
{
Reference<XTextContent> xBookmark;
BkmType const nBkmType;
BkmType nBkmType;
const SwPosition aPosition;
SwXBookmarkPortion_Impl(uno::Reference<text::XTextContent> const& xMark,
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 9113c4b..446e076 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -132,15 +132,15 @@ class SwStyleProperties_Impl;
using GetCountOrName_t = std::function<sal_Int32 (const SwDoc&, OUString*, sal_Int32)>;
using CreateStyle_t = std::function<uno::Reference<css::style::XStyle>(SfxStyleSheetBasePool*, SwDocShell*, const OUString&)>;
using TranslateIndex_t = std::function<sal_uInt16(const sal_uInt16)>;
SfxStyleFamily const m_eFamily;
sal_uInt16 const m_nPropMapType;
SfxStyleFamily m_eFamily;
sal_uInt16 m_nPropMapType;
uno::Reference<beans::XPropertySetInfo> m_xPSInfo;
SwGetPoolIdFromName const m_aPoolId;
OUString const m_sName;
SwGetPoolIdFromName m_aPoolId;
OUString m_sName;
const char* m_pResId;
GetCountOrName_t const m_fGetCountOrName;
CreateStyle_t const m_fCreateStyle;
TranslateIndex_t const m_fTranslateIndex;
GetCountOrName_t m_fGetCountOrName;
CreateStyle_t m_fCreateStyle;
TranslateIndex_t m_fTranslateIndex;
StyleFamilyEntry(SfxStyleFamily eFamily, sal_uInt16 nPropMapType, SwGetPoolIdFromName aPoolId, OUString const& sName, const char* pResId, GetCountOrName_t const & fGetCountOrName, CreateStyle_t const & fCreateStyle, TranslateIndex_t const & fTranslateIndex)
: m_eFamily(eFamily)
, m_nPropMapType(nPropMapType)
@@ -175,9 +175,9 @@ class SwStyleProperties_Impl;
using collectionbits_t = sal_uInt16;
struct ParagraphStyleCategoryEntry
{
paragraphstyle_t const m_eCategory;
SfxStyleSearchBits const m_nSwStyleBits;
collectionbits_t const m_nCollectionBits;
paragraphstyle_t m_eCategory;
SfxStyleSearchBits m_nSwStyleBits;
collectionbits_t m_nCollectionBits;
ParagraphStyleCategoryEntry(paragraphstyle_t eCategory, SfxStyleSearchBits nSwStyleBits, collectionbits_t nCollectionBits)
: m_eCategory(eCategory)
, m_nSwStyleBits(nSwStyleBits)
@@ -314,7 +314,7 @@ class SwXStyle : public cppu::WeakImplHelper
OUString m_sStyleName;
const StyleFamilyEntry& m_rEntry;
bool m_bIsDescriptor;
bool const m_bIsConditional;
bool m_bIsConditional;
OUString m_sParentStyleName;
protected:
@@ -1504,7 +1504,7 @@ private:
rtl::Reference<SwDocStyleSheet> m_xNewBase;
SfxItemSet* m_pItemSet;
std::unique_ptr<SfxItemSet> m_pMyItemSet;
OUString const m_rStyleName;
OUString m_rStyleName;
const SwAttrSet* m_pParentStyle;
public:
SwStyleBase_Impl(SwDoc& rSwDoc, const OUString& rName, const SwAttrSet* pParentStyle)
@@ -1551,7 +1551,7 @@ public:
struct ItemSetOverrider
{
SwStyleBase_Impl& m_rStyleBase;
SfxItemSet* const m_pOldSet;
SfxItemSet* m_pOldSet;
ItemSetOverrider(SwStyleBase_Impl& rStyleBase, SfxItemSet* pTemp)
: m_rStyleBase(rStyleBase)
, m_pOldSet(m_rStyleBase.m_pItemSet)
@@ -3394,7 +3394,7 @@ class SwAutoStylesEnumImpl
std::vector<std::shared_ptr<SfxItemSet>> mAutoStyles;
std::vector<std::shared_ptr<SfxItemSet>>::iterator aIter;
SwDoc* pDoc;
IStyleAccess::SwAutoStyleFamily const eFamily;
IStyleAccess::SwAutoStyleFamily eFamily;
public:
SwAutoStylesEnumImpl( SwDoc* pInitDoc, IStyleAccess::SwAutoStyleFamily eFam );
bool hasMoreElements() { return aIter != mAutoStyles.end(); }
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 207ff49..734702a 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1788,7 +1788,7 @@ namespace {
struct VerticallyMergedCell
{
std::vector<uno::Reference< beans::XPropertySet > > aCells;
sal_Int32 const nLeftPosition;
sal_Int32 nLeftPosition;
bool bOpen;
VerticallyMergedCell(uno::Reference< beans::XPropertySet > const& rxCell,
@@ -2483,7 +2483,7 @@ class SwXHeadFootText::Impl
{
public:
SwFrameFormat* m_pHeadFootFormat;
bool const m_bIsHeader;
bool m_bIsHeader;
Impl(SwFrameFormat& rHeadFootFormat, const bool bIsHeader)
: m_pHeadFootFormat(&rHeadFootFormat)
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index ef35a74..5f09eb9 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -54,7 +54,7 @@ class SwQueuedPaint
{
public:
SwQueuedPaint *pNext;
SwViewShell* const pSh;
SwViewShell *pSh;
SwRect aRect;
SwQueuedPaint( SwViewShell *pNew, const SwRect &rRect ) :
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index c020368..5bc3999 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -56,7 +56,7 @@ class SwASCIIParser
std::unique_ptr<SfxItemSet> pItemSet;
long nFileSize;
SvtScriptType nScript;
bool const bNewDoc;
bool bNewDoc;
ErrCode ReadChars();
void InsertText( const OUString& rStr );
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 9ff97e4..5e9af3a 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -398,7 +398,7 @@ namespace
struct CharSetNameMap
{
rtl_TextEncoding const eCode;
rtl_TextEncoding eCode;
const char* pName;
};
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index a9cea1b..5445115 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -211,7 +211,7 @@ namespace {
class SwCSS1OutMode
{
SwHTMLWriter& rWrt;
sal_uInt16 const nOldMode;
sal_uInt16 nOldMode;
public:
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 3250307..f7dd8ac 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1084,11 +1084,11 @@ class HTMLEndPosLst
std::vector<sal_uInt16> aScriptLst;
SwDoc *pDoc; // the current document
SwDoc* const pTemplate; // the HTML template (or 0)
SwDoc* pTemplate; // the HTML template (or 0)
std::optional<Color> xDfltColor;// the default foreground colors
std::set<OUString>& rScriptTextStyles;
sal_uLong const nHTMLMode;
sal_uLong nHTMLMode;
bool bOutStyles : 1; // are styles exported
// Insert/remove a SttEndPos in/from the Start and End lists.
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 24786c5..e104a1e 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -43,7 +43,7 @@ namespace {
struct HTMLNumFormatTableEntry
{
const char *pName;
NfIndexTableOffset const eFormat;
NfIndexTableOffset eFormat;
};
}
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index 9072233..32b9d80 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -97,9 +97,9 @@ class SwHTMLPosFlyFrame
const SwFrameFormat *pFrameFormat; // the frame
const SdrObject *pSdrObject; // maybe Sdr-Object
SwNodeIndex *pNdIdx; // Node-Index
sal_uInt32 const nOrdNum; // from SwPosFlyFrame
sal_uInt32 nOrdNum; // from SwPosFlyFrame
sal_Int32 nContentIdx; // its position in content
AllHtmlFlags const nAllFlags;
AllHtmlFlags nAllFlags;
SwHTMLPosFlyFrame(const SwHTMLPosFlyFrame&) = delete;
SwHTMLPosFlyFrame& operator=(const SwHTMLPosFlyFrame&) = delete;
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index c13ee2b..67b3a2f 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -179,9 +179,9 @@ const char * aEventOptionTable[] =
class SwHTMLForm_Impl
{
SwDocShell * const m_pDocShell;
SwDocShell *m_pDocShell;
SvKeyValueIterator * const m_pHeaderAttrs;
SvKeyValueIterator *m_pHeaderAttrs;
// Cached interfaces
uno::Reference< drawing::XDrawPage > m_xDrawPage;
@@ -370,8 +370,8 @@ class SwHTMLImageWatcher :
uno::Reference< drawing::XShape > xShape; // the control
uno::Reference< XImageProducerSupplier > xSrc;
uno::Reference< awt::XImageConsumer > xThis; // reference to self
bool const bSetWidth;
bool const bSetHeight;
bool bSetWidth;
bool bSetHeight;
void clear();
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index e95e08c..30ca53a 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -120,8 +120,8 @@ class HTMLTableContext
SwFrameFormat *pFrameFormat; // the Fly frame::Frame, containing the table
std::unique_ptr<SwPosition> pPos; // position behind the table
size_t const nContextStAttrMin;
size_t const nContextStMin;
size_t nContextStAttrMin;
size_t nContextStMin;
bool bRestartPRE : 1;
bool bRestartXMP : 1;
@@ -443,14 +443,14 @@ private:
bool m_bInheritedRightBorder;
bool m_bBordersSet; // the border is set already
bool m_bForceFrame;
bool const m_bTableAdjustOfTag; // comes nTableAdjust from <TABLE>?
bool m_bTableAdjustOfTag; // comes nTableAdjust from <TABLE>?
sal_uInt32 m_nHeadlineRepeat; // repeating rows
bool const m_bIsParentHead;
bool m_bIsParentHead;
bool m_bHasParentSection;
bool const m_bHasToFly;
bool const m_bFixedCols;
bool m_bHasToFly;
bool m_bFixedCols;
bool m_bColSpec; // where there COL(GROUP)-elements?
bool const m_bPercentWidth; // width is declared in %
bool m_bPercentWidth; // width is declared in %
SwHTMLParser *m_pParser; // the current parser
std::unique_ptr<HTMLTableCnts> m_xParentContents;
@@ -460,13 +460,13 @@ private:
std::shared_ptr<SwHTMLTableLayout> m_xLayoutInfo;
// the following parameters are from the <TABLE>-Tag
sal_uInt16 const m_nWidth; // width of the table
sal_uInt16 m_nWidth; // width of the table
sal_uInt16 m_nHeight; // absolute height of the table
SvxAdjust const m_eTableAdjust; // drawing::Alignment of the table
sal_Int16 const m_eVertOrientation; // Default vertical direction of the cells
SvxAdjust m_eTableAdjust; // drawing::Alignment of the table
sal_Int16 m_eVertOrientation; // Default vertical direction of the cells
sal_uInt16 m_nBorder; // width of the external border
HTMLTableFrame const m_eFrame; // frame around the table
HTMLTableRules const m_eRules; // frame in the table
HTMLTableFrame m_eFrame; // frame around the table
HTMLTableRules m_eRules; // frame in the table
bool m_bTopCaption; // Caption of the table
void InitCtor(const HTMLTableOptions& rOptions);
@@ -2845,7 +2845,7 @@ class CellSaveStruct : public SectionSaveStruct
sal_Int16 m_eVertOri;
bool const m_bHead : 1;
bool m_bHead : 1;
bool m_bPercentWidth : 1;
bool m_bHasNumFormat : 1;
bool m_bHasValue : 1;
@@ -4480,7 +4480,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
class CaptionSaveStruct : public SectionSaveStruct
{
SwPosition const aSavePos;
SwPosition aSavePos;
SwHTMLNumRuleInfo aNumRuleInfo; // valid numbering
public:
@@ -4918,8 +4918,8 @@ namespace
class IndexInRange
{
private:
SwNodeIndex const maStart;
SwNodeIndex const maEnd;
SwNodeIndex maStart;
SwNodeIndex maEnd;
public:
explicit IndexInRange(const SwNodeIndex& rStart, const SwNodeIndex& rEnd)
: maStart(rStart)
diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx
index 7afbd84..6e2d504 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -90,8 +90,8 @@ enum CSS1SelectorType
*/
class CSS1Selector
{
CSS1SelectorType const eType; // the type
OUString const aSelector; // the selector itself
CSS1SelectorType eType; // the type
OUString aSelector; // the selector itself
CSS1Selector *pNext; // the following component
public:
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index cb87145..677fe19 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -86,7 +86,7 @@ namespace o3tl {
struct CSS1PropertyEnum
{
const char *pName; // property value
sal_uInt16 const nEnum; // and the corresponding value of enum
sal_uInt16 nEnum; // and the corresponding value of enum
};
namespace editeng { class SvxBorderLine; }
@@ -192,7 +192,7 @@ class SvxCSS1Parser : public CSS1Parser
CSS1Map m_Pages;
CSS1Map m_Tags;
OUString const sBaseURL;
OUString sBaseURL;
std::unique_ptr<SfxItemSet> pSheetItemSet; // item set of Style-Sheet
SfxItemSet *pItemSet; // current item set
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index 54d03ed..548a566 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -48,7 +48,7 @@ class SwCSS1Parser : public SvxCSS1Parser
sal_uInt16 m_nDropCapCnt;
bool const m_bIsNewDoc : 1;
bool m_bIsNewDoc : 1;
bool m_bBodyBGColorSet : 1;
bool m_bBodyBackgroundSet : 1;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index d14e431..9abff414 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -203,14 +203,14 @@ class HTMLAttrContext
{
HTMLAttrs m_aAttrs; // the attributes created in the context
OUString const m_aClass; // context class
OUString m_aClass; // context class
std::unique_ptr<HTMLAttrContext_SaveDoc> m_pSaveDocContext;
std::unique_ptr<SfxItemSet> m_pFrameItemSet;
HtmlTokenId const m_nToken; // the token of the context
HtmlTokenId m_nToken; // the token of the context
sal_uInt16 const m_nTextFormatColl; // a style created in the context or zero
sal_uInt16 m_nTextFormatColl; // a style created in the context or zero
sal_uInt16 m_nLeftMargin; // a changed left border
sal_uInt16 m_nRightMargin; // a changed right border
@@ -223,7 +223,7 @@ class HTMLAttrContext
bool m_bLRSpaceChanged : 1; // left/right border, changed indent?
bool m_bULSpaceChanged : 1; // top/bottom border changed?
bool const m_bDefaultTextFormatColl : 1;// nTextFormatColl is only default
bool m_bDefaultTextFormatColl : 1;// nTextFormatColl is only default
bool m_bSpansSection : 1; // the context opens a SwSection
bool m_bPopStack : 1; // delete above stack elements
bool m_bFinishPREListingXMP : 1;
@@ -336,7 +336,7 @@ class SwHTMLParser : public SfxHTMLParser, public SvtListener
*/
std::unique_ptr<ImportProgress> m_xProgress;
OUString const m_aPathToFile;
OUString m_aPathToFile;
OUString m_sBaseURL;
OUString m_aBasicLib;
OUString m_aBasicModule;
@@ -939,7 +939,7 @@ struct SwPendingData
struct SwPending
{
HtmlTokenId const nToken;
HtmlTokenId nToken;
std::unique_ptr<SwPendingData> pData;
SwPending( HtmlTokenId nTkn )
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index f23a5d6..fe50f51 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -631,12 +631,12 @@ struct HTMLSaveData
SwPaM *pOldEnd;
std::unique_ptr<SwHTMLNumRuleInfo> pOldNumRuleInfo; // Owner = this
std::unique_ptr<SwHTMLNumRuleInfo> pOldNextNumRuleInfo;
sal_uInt16 const nOldDefListLvl;
SvxFrameDirection const nOldDirection;
sal_uInt16 nOldDefListLvl;
SvxFrameDirection nOldDirection;
bool bOldWriteAll : 1;
bool const bOldOutHeader : 1;
bool const bOldOutFooter : 1;
bool const bOldOutFlyFrame : 1;
bool bOldOutHeader : 1;
bool bOldOutFooter : 1;
bool bOldOutFlyFrame : 1;
HTMLSaveData( SwHTMLWriter&, sal_uLong nStt, sal_uLong nEnd,
bool bSaveNum=true,
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index e0b41c9..9284674 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -126,7 +126,7 @@ private:
typedef std::vector<std::unique_ptr<SwFltStackEntry>> Entries;
Entries m_Entries;
sal_uLong const nFieldFlags;
sal_uLong nFieldFlags;
bool bHasSdOD;
bool bSdODChecked;
@@ -212,9 +212,9 @@ class SwFltAnchorListener : public SvtListener
class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem
{
public:
DateTime const aStamp;
RedlineType const eType;
std::size_t const nAutorNo;
DateTime aStamp;
RedlineType eType;
std::size_t nAutorNo;
SwFltRedline(RedlineType eType_,
std::size_t nAutorNo_,
@@ -234,10 +234,10 @@ class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem
{
private:
long const mnHandle;
long mnHandle;
OUString maName;
OUString const maVal;
bool const mbIsTOCBookmark;
OUString maVal;
bool mbIsTOCBookmark;
public:
SwFltBookmark( const OUString& rNa,
@@ -311,7 +311,7 @@ SW_DLLPUBLIC void UpdatePageDescs(SwDoc &rDoc, size_t nInPageDescOffset);
class ImportProgress
{
private:
SwDocShell * const m_pDocShell;
SwDocShell *m_pDocShell;
public:
ImportProgress(SwDocShell *pDocShell, long nStartVal, long nEndVal)
: m_pDocShell(pDocShell)
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 13097a4..87168a5 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -284,7 +284,7 @@ namespace sw
void InsertTable(SwTableNode &rTableNode, SwPaM &rPaM);
explicit InsertedTablesManager(const SwDoc &rDoc);
private:
bool const mbHasRoot;
bool mbHasRoot;
TableMap maTables;
};
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 1dc4cf1..27710a1 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -48,15 +48,15 @@ class SW_DLLPUBLIC SwWriteTableCell
const SwTableBox *pBox; // SwTableBox of the cell
const SvxBrushItem *pBackground; // inherited background of a row
long const nHeight; // fix/minimum height of a row
long nHeight; // fix/minimum height of a row
sal_uInt32 nWidthOpt; // width from option;
sal_uInt16 const nRow; // start row
sal_uInt16 const nCol; // start column
sal_uInt16 nRow; // start row
sal_uInt16 nCol; // start column
sal_uInt16 const nRowSpan; // spanned rows
sal_uInt16 const nColSpan; // spanned columns
sal_uInt16 nRowSpan; // spanned rows
sal_uInt16 nColSpan; // spanned columns
bool bPercentWidthOpt;
@@ -98,8 +98,8 @@ class SwWriteTableRow final
SwWriteTableCells m_Cells; ///< all cells of the rows
const SvxBrushItem *pBackground; // background
long const nPos; // end position (twips) of the row
bool const mbUseLayoutHeights;
long nPos; // end position (twips) of the row
bool mbUseLayoutHeights;
SwWriteTableRow & operator= (const SwWriteTableRow &) = delete;
@@ -156,7 +156,7 @@ using SwWriteTableRows
class SwWriteTableCol
{
sal_uInt32 const nPos; // end position of the column
sal_uInt32 nPos; // end position of the column
sal_uInt32 nWidthOpt;
@@ -225,24 +225,24 @@ protected:
sal_uInt16 m_nBorder; // thickness of the outer border
sal_uInt16 m_nInnerBorder; // thickness of the inner border
sal_uInt32 const m_nBaseWidth; // reference value for SwFormatFrameSize width
sal_uInt32 m_nBaseWidth; // reference value for SwFormatFrameSize width
sal_uInt16 m_nHeadEndRow; // last row of the table heading
sal_uInt16 const m_nLeftSub;
sal_uInt16 const m_nRightSub;
sal_uInt16 m_nLeftSub;
sal_uInt16 m_nRightSub;
sal_uInt32 m_nTabWidth; // absolute/relative width of the table
bool const m_bRelWidths : 1; // generate relative widths?
bool m_bRelWidths : 1; // generate relative widths?
bool m_bUseLayoutHeights : 1; // use layout to determine the height?
#ifdef DBG_UTIL
bool m_bGetLineHeightCalled : 1;
#endif
bool const m_bColTags : 1;
bool const m_bLayoutExport : 1;
bool const m_bCollectBorderWidth : 1;
bool m_bColTags : 1;
bool m_bLayoutExport : 1;
bool m_bCollectBorderWidth : 1;
virtual bool ShouldExpandSub( const SwTableBox *pBox,
bool bExpandedBefore, sal_uInt16 nDepth ) const;
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index c381fac..1f344d4 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -114,8 +114,8 @@ public:
class CellInfo
{
SwRect const m_aRect;
WW8TableNodeInfo * const m_pNodeInfo;
SwRect m_aRect;
WW8TableNodeInfo * m_pNodeInfo;
unsigned long m_nFormatFrameWidth;
public:
@@ -167,7 +167,7 @@ public:
std::greater<sal_uInt32> > Inners_t;
private:
WW8TableInfo * const mpParent;
WW8TableInfo * mpParent;
sal_uInt32 mnDepth;
const SwNode * mpNode;
Inners_t mInners;
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 3a0b157..736f2a7 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -145,7 +145,7 @@ enum StyleType
class AttributeOutputBase
{
private:
SvtSaveOptions const m_aSaveOpt;
SvtSaveOptions m_aSaveOpt;
OUString m_sBaseURL; // To be used in ConvertURL
OUString ConvertURL( const OUString& rUrl, bool bAbsoluteOut );
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1810a8d..9dd1e4d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2442,8 +2442,8 @@ namespace
struct NameToId
{
OUString const maName;
sal_Int32 const maId;
OUString maName;
sal_Int32 maId;
};
const NameToId constNameToIdMapping[] =
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index dc77baf..4e86044 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -870,7 +870,7 @@ private:
: grfNode( n ), size( s ), pSdrObj(sObj) {};
const SwGrfNode* grfNode;
Size const size;
Size size;
const SdrObject* pSdrObj;
};
std::unique_ptr< std::vector<PostponedGraphic> > m_pPostponedGraphic;
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index d5d610f..33c02cd 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -105,7 +105,7 @@ class DocxExport : public MSWordExportBase
std::unique_ptr<DocxSdrExport> m_pSdrExport;
/// If the result will be a .docm file or not.
bool const m_bDocm;
bool m_bDocm;
/// Export is done into template (.dotx)
bool const m_bTemplate;
diff --git a/sw/source/filter/ww8/docxhelper.hxx b/sw/source/filter/ww8/docxhelper.hxx
index b90059a..4791aaa 100644
--- a/sw/source/filter/ww8/docxhelper.hxx
+++ b/sw/source/filter/ww8/docxhelper.hxx
@@ -15,7 +15,7 @@
struct DocxStringTokenMap
{
const char* pToken;
sal_Int32 const nToken;
sal_Int32 nToken;
};
sal_Int32 DocxStringGetToken(DocxStringTokenMap const * pMap, const OUString& rName);
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 60e8870..77f4244 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -46,7 +46,7 @@ class RtfExport : public MSWordExportBase
MSWordSections* m_pSections;
std::unique_ptr<RtfSdrExport> m_pSdrExport;
bool const m_bOutOutlineOnly;
bool m_bOutOutlineOnly;
public:
/// Access to the attribute output class.
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index c3506b1..9da717b8 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -136,7 +136,7 @@ namespace
class anchoredto
{
private:
sal_uLong const mnNode;
sal_uLong mnNode;
public:
explicit anchoredto(sal_uLong nNode) : mnNode(nNode) {}
bool operator()(const ww8::Frame &rFrame) const
@@ -686,7 +686,7 @@ namespace sw
class SameOpenRedlineType
{
private:
RedlineType const meType;
RedlineType meType;
public:
explicit SameOpenRedlineType(RedlineType eType) : meType(eType) {}
bool operator()(const std::unique_ptr<SwFltStackEntry> & pEntry) const
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 05c1467..8893386 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -325,7 +325,7 @@ namespace myImplHelpers
class IfBeforeStart
{
private:
sal_Int32 const mnStart;
sal_Int32 mnStart;
public:
explicit IfBeforeStart(sal_Int32 nStart) : mnStart(nStart) {}
bool operator()(const sw::util::CharRunEntry &rEntry) const
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 9e302b6..8010aab 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -178,9 +178,9 @@ struct WW8_SepInfo
const SwPageDesc* pPageDesc;
const SwSectionFormat* pSectionFormat;
const SwNode* pPDNd;
sal_uLong const nLnNumRestartNo;
::std::optional<sal_uInt16> const oPgRestartNo;
bool const bIsFirstParagraph;
sal_uLong nLnNumRestartNo;
::std::optional<sal_uInt16> oPgRestartNo;
bool bIsFirstParagraph;
WW8_SepInfo( const SwPageDesc* pPD, const SwSectionFormat* pFormat,
sal_uLong nLnRestart, ::std::optional<sal_uInt16> oPgRestart = std::nullopt,
@@ -305,9 +305,9 @@ private:
OUString msFamilyNm;
OUString msAltNm;
bool mbAlt;
FontPitch const mePitch;
FontFamily const meFamily;
rtl_TextEncoding const meChrSet;
FontPitch mePitch;
FontFamily meFamily;
rtl_TextEncoding meChrSet;
public:
wwFont( const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily,
rtl_TextEncoding eChrSet);
@@ -344,13 +344,13 @@ public:
class DrawObj
{
public:
WW8_CP const mnCp; // CP-Pos of references
WW8_CP mnCp; // CP-Pos of references
sal_uInt32 mnShapeId; // ShapeId for the SwFrameFormats
ww8::Frame maContent; // the frame itself
Point const maParentPos; // Points
Point maParentPos; // Points
sal_Int32 mnThick; // Border Thicknesses
SvxFrameDirection const mnDirection; // If BiDi or not
unsigned int const mnHdFtIndex; // 0 for main text, +1 for each subsequent
SvxFrameDirection mnDirection; // If BiDi or not
unsigned int mnHdFtIndex; // 0 for main text, +1 for each subsequent
// msword hd/ft
DrawObj(const ww8::Frame &rContent, WW8_CP nCp, Point aParentPos, SvxFrameDirection nDir,
@@ -455,7 +455,7 @@ class MSWordExportBase
public:
wwFontHelper m_aFontHelper;
std::vector<sal_uLong> m_aChapterFieldLocs;
OUString const m_aMainStg;
OUString m_aMainStg;
std::vector<const SwTOXType*> m_aTOXArr;
const SfxItemSet* m_pISet; // for double attributes
WW8_WrPct* m_pPiece; // Pointer to Piece-Table
@@ -998,7 +998,7 @@ public:
std::unique_ptr<WW8_WrPlcFootnoteEdn> pEdn; ///< Endnotes - structure to remember them, and output
std::unique_ptr<WW8_WrPlcSepx> pSepx; ///< Sections/headers/footers
bool const m_bDot; ///< Template or document.
bool m_bDot; ///< Template or document.
protected:
SwWW8Writer *m_pWriter; ///< Pointer to the writer
@@ -1237,7 +1237,7 @@ protected:
class WW8_WrPlcFootnoteEdn : public WW8_WrPlcSubDoc
{
private:
sal_uInt8 const nTyp;
sal_uInt8 nTyp;
WW8_WrPlcFootnoteEdn(const WW8_WrPlcFootnoteEdn&) = delete;
WW8_WrPlcFootnoteEdn& operator=(WW8_WrPlcFootnoteEdn const &) = delete;
@@ -1337,7 +1337,7 @@ private:
std::vector<WW8_CP> aPos;
std::unique_ptr<sal_uInt8[]> pData; // content ( structures )
sal_uLong nDataLen;
sal_uInt16 const nStructSiz;
sal_uInt16 nStructSiz;
WW8_WrPlc1(const WW8_WrPlc1&) = delete;
WW8_WrPlc1& operator=(const WW8_WrPlc1&) = delete;
@@ -1356,7 +1356,7 @@ public:
class WW8_WrPlcField : public WW8_WrPlc1
{
private:
sal_uInt8 const nTextTyp;
sal_uInt8 nTextTyp;
sal_uInt16 nResults;
WW8_WrPlcField(const WW8_WrPlcField&) = delete;
@@ -1384,10 +1384,10 @@ public:
class GraphicDetails
{
public:
ww8::Frame const maFly; // surrounding FlyFrames
ww8::Frame maFly; // surrounding FlyFrames
sal_uLong mnPos; // FilePos of the graphics
sal_uInt16 const mnWid; // Width of the graphics
sal_uInt16 const mnHei; // Height of the graphics
sal_uInt16 mnWid; // Width of the graphics
sal_uInt16 mnHei; // Height of the graphics
GraphicDetails(const ww8::Frame &rFly, sal_uInt16 nWid, sal_uInt16 nHei)
: maFly(rFly), mnPos(0), mnWid(nWid), mnHei(nHei)
@@ -1438,7 +1438,7 @@ public:
class MSWordAttrIter
{
private:
MSWordAttrIter* const pOld;
MSWordAttrIter* pOld;
MSWordAttrIter(const MSWordAttrIter&) = delete;
MSWordAttrIter& operator=(const MSWordAttrIter&) = delete;
protected:
@@ -1465,7 +1465,7 @@ private:
sal_Int32 nTmpSwPos; // for HasItem()
rtl_TextEncoding eNdChrSet;
sal_uInt16 nScript;
sal_uInt8 const mnTyp;
sal_uInt8 mnTyp;
sal_Int32 SearchNext( sal_Int32 nStartPos );
void SetCharSet(const EECharAttrib& rTextAttr, bool bStart);
@@ -1576,7 +1576,7 @@ class MSWordStyles
sal_uInt16 m_aHeadingParagraphStyles[MAXLEVEL];
std::unique_ptr<SwFormat*[]> m_pFormatA; ///< Slot <-> Character and paragraph style array (0 for list styles).
sal_uInt16 m_nUsedSlots;
bool const m_bListStyles; ///< If list styles are requested to be exported as well.
bool m_bListStyles; ///< If list styles are requested to be exported as well.
std::map<sal_uInt16, const SwNumRule*> m_aNumRules; ///< Slot <-> List style map.
/// We need to build style id's for DOCX export; ideally we should roundtrip that, but this is good enough.
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 3779098..fd847de 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -75,7 +75,7 @@ private:
std::shared_ptr<WW8GlossaryFib> xGlossary;
tools::SvRef<SotStorageStream> xTableStream;
tools::SvRef<SotStorageStream> &rStrm;
tools::SvRef<SotStorage> const xStg;
tools::SvRef<SotStorage> xStg;
sal_uInt16 nStrings;
static bool MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, bool bSaveRelFile,
diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx
index 0e98b7d..3b05c53 100644
--- a/sw/source/filter/ww8/ww8graf.hxx
+++ b/sw/source/filter/ww8/ww8graf.hxx
@@ -59,7 +59,7 @@ private:
std::stack<sal_uInt16> maIndexes;
sw::util::SetLayer const maSetLayer;
sw::util::SetLayer maSetLayer;
sal_uLong mnNoInitialObjects;
sal_uLong mnInlines;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index bc047d6..a3731fa 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -160,7 +160,7 @@ public:
static SvxNumType GetSvxNumTypeFromMSONFC(sal_uInt16 nMSONFC);
private:
wwSprmParser const maSprmParser;
wwSprmParser maSprmParser;
SwWW8ImplReader& rReader;
SwDoc& rDoc;
const WW8Fib& rFib;
@@ -592,7 +592,7 @@ class WW8ReaderSave
{
private:
WW8PLCFxSaveAll maPLCFxSave;
SwPosition const maTmpPos;
SwPosition maTmpPos;
std::deque<bool> maOldApos;
std::deque<WW8FieldEntry> maOldFieldStack;
std::unique_ptr<SwWW8FltControlStack> mxOldStck;
@@ -601,22 +601,22 @@ private:
std::shared_ptr<WW8PLCFMan> mxOldPlcxMan;
std::unique_ptr<WW8FlyPara> mpWFlyPara;
std::unique_ptr<WW8SwFlyPara> mpSFlyPara;
SwPaM* const mpPreviousNumPaM;
SwPaM* mpPreviousNumPaM;
const SwNumRule* mpPrevNumRule;
std::unique_ptr<WW8TabDesc> mxTableDesc;
int const mnInTable;
sal_uInt16 const mnCurrentColl;
sal_Unicode const mcSymbol;
bool const mbIgnoreText;
bool const mbSymbol;
bool const mbHdFtFootnoteEdn;
bool const mbTxbxFlySection;
bool const mbAnl;
bool const mbInHyperlink;
bool const mbPgSecBreak;
bool const mbWasParaEnd;
bool const mbHasBorder;
bool const mbFirstPara;
int mnInTable;
sal_uInt16 mnCurrentColl;
sal_Unicode mcSymbol;
bool mbIgnoreText;
bool mbSymbol;
bool mbHdFtFootnoteEdn;
bool mbTxbxFlySection;
bool mbAnl;
bool mbInHyperlink;
bool mbPgSecBreak;
bool mbWasParaEnd;
bool mbHasBorder;
bool mbFirstPara;
public:
WW8ReaderSave(SwWW8ImplReader* pRdr, WW8_CP nStart=-1);
void Restore(SwWW8ImplReader* pRdr);
@@ -689,7 +689,7 @@ public:
virtual bool Import(const css::uno::Reference< css::lang::XMultiServiceFactory> &rServiceFactory,
css::uno::Reference< css::form::XFormComponent> &rFComp,
css::awt::Size &rSz) = 0;
OUString const msName;
OUString msName;
};
class WW8FormulaCheckBox : public WW8FormulaControl
@@ -746,7 +746,7 @@ public:
css::uno::Reference< css::drawing::XShape > *pShapeRef,
bool bFloatingCtrl=false );
private:
SwPaM * const pPaM;
SwPaM *pPaM;
sal_uInt32 mnObjectId;
};
@@ -931,9 +931,9 @@ public:
class wwFrameNamer
{
private:
OUString const msSeed;
OUString msSeed;
sal_Int32 mnImportedGraphicsCount;
bool const mbIsDisabled;
bool mbIsDisabled;
wwFrameNamer(wwFrameNamer const&) = delete;
wwFrameNamer& operator=(wwFrameNamer const&) = delete;
@@ -950,7 +950,7 @@ class wwSectionNamer
{
private:
const SwDoc &mrDoc;
OUString const msFileLinkSeed;
OUString msFileLinkSeed;
int mnFileSectionNo;
wwSectionNamer(const wwSectionNamer&) = delete;
wwSectionNamer& operator=(const wwSectionNamer&) = delete;
@@ -998,8 +998,8 @@ class SwDocShell;
struct WW8PostProcessAttrsInfo
{
bool mbCopy;
WW8_CP const mnCpStart;
WW8_CP const mnCpEnd;
WW8_CP mnCpStart;
WW8_CP mnCpEnd;
SwPaM mPaM;
SfxItemSet mItemSet;
@@ -1264,7 +1264,7 @@ private:
std::unique_ptr<WW8SmartTagData> m_pSmartTagData;
sw::util::AuthorInfos m_aAuthorInfos;
OUString const m_sBaseURL;
OUString m_sBaseURL;
// Ini-Flags:
sal_uInt32 m_nIniFlags; // flags from writer.ini
@@ -1298,14 +1298,14 @@ private:
sal_Unicode m_cSymbol; // symbol to be read now
sal_uInt8 const m_nWantedVersion; // originally requested WW-Doc version by Writer
sal_uInt8 m_nWantedVersion; // originally requested WW-Doc version by Writer
sal_uInt8 m_nSwNumLevel; // level number for outline / enumeration
sal_uInt8 m_nWwNumType; // outline / number / enumeration
sal_uInt8 m_nListLevel;
bool const m_bNewDoc; // new document?
bool const m_bSkipImages; // skip images for text extraction/indexing
bool m_bNewDoc; // new document?
bool m_bSkipImages; // skip images for text extraction/indexing
bool m_bReadNoTable; // no tables
bool m_bPgSecBreak; // Page- or Sectionbreak is still to be added
bool m_bSpec; // special char follows in text
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 2c6d239..a1bd12d 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -51,7 +51,7 @@ class XMLRedlineImportHelper final
// if true, no redlines should be inserted into document
// (This typically happen when a document is loaded in 'insert'-mode.)
bool const m_bIgnoreRedlines;
bool m_bIgnoreRedlines;
// save information for saving and reconstruction of the redline mode
css::uno::Reference<css::beans::XPropertySet> m_xModelPropertySet;
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index b7cfde1..eb9b8e0 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -61,13 +61,13 @@ namespace {
class SwXMLConditionParser_Impl
{
OUString const sInput;
OUString sInput;
Master_CollCondition nCondition;
sal_uInt32 nSubCondition;
sal_Int32 nPos;
sal_Int32 const nLength;
sal_Int32 nLength;
inline bool SkipWS();
inline bool MatchChar( sal_Unicode c );
diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx
index bf54b47..af4c12e 100644
--- a/sw/source/filter/xml/xmlitmap.hxx
+++ b/sw/source/filter/xml/xmlitmap.hxx
@@ -38,14 +38,14 @@
struct SvXMLItemMapEntry
{
sal_uInt16 const nNameSpace; // declares the Namespace in which this item
sal_uInt16 nNameSpace; // declares the Namespace in which this item
// exists
sal_uInt16 nWhichId; // the WhichId to identify the item
// in the pool
enum ::xmloff::token::XMLTokenEnum const eLocalName;
// the local name for the item inside
// the Namespace (as an XMLTokenEnum)
sal_uInt32 const nMemberId; // the memberid specifies which part
sal_uInt32 nMemberId; // the memberid specifies which part
// of the item should be imported or
// exported with this Namespace
// and localName
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index f9496ff..c047064d 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -79,7 +79,7 @@ enum SvXMLTokenMapAttrs
};
struct statistic {
SvXMLTokenMapAttrs const token;
SvXMLTokenMapAttrs token;
const char* name;
sal_uInt16 SwDocStat::* target16;
sal_uLong SwDocStat::* target32; /* or 64, on LP64 platforms */
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index b2c92a7..46a1e74 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -483,7 +483,7 @@ class SwXMLTableInfo_Impl
const SwTable *m_pTable;
Reference<XTextSection> m_xBaseSection;
bool m_bBaseSectionValid;
sal_uInt32 const m_nPrefix;
sal_uInt32 m_nPrefix;
public:
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 184047f..70d0248 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -387,7 +387,7 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext
OUString m_sSaveParaDefault;
OUString m_StringValue;
SvXMLImportContextRef const m_xMyTable;
SvXMLImportContextRef m_xMyTable;
double m_fValue;
bool m_bHasValue;
@@ -713,7 +713,7 @@ namespace {
class SwXMLTableColContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef const xMyTable;
SvXMLImportContextRef xMyTable;
SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(xMyTable.get()); }
@@ -802,7 +802,7 @@ namespace {
class SwXMLTableColsContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef const xMyTable;
SvXMLImportContextRef xMyTable;
SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(xMyTable.get()); }
@@ -851,7 +851,7 @@ namespace {
class SwXMLTableRowContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef const xMyTable;
SvXMLImportContextRef xMyTable;
sal_uInt32 nRowRepeat;
@@ -968,9 +968,9 @@ namespace {
class SwXMLTableRowsContext_Impl : public SvXMLImportContext
{
SvXMLImportContextRef const xMyTable;
SvXMLImportContextRef xMyTable;
bool const bHeader;
bool bHeader;
SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(xMyTable.get()); }
@@ -1188,9 +1188,9 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext,
class TableBoxIndex
{
public:
OUString const msName;
sal_Int32 const mnWidth;
bool const mbProtected;
OUString msName;
sal_Int32 mnWidth;
bool mbProtected;
TableBoxIndex( const OUString& rName, sal_Int32 nWidth,
bool bProtected ) :
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 4a3fd24..18d6958 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -73,9 +73,9 @@ namespace {
struct XMLServiceMapEntry_Impl
{
const char *sFilterService;
sal_Int32 const nFilterServiceLen;
sal_Int32 nFilterServiceLen;
sal_uInt32 const n1;
sal_uInt32 n1;
sal_uInt16 n2, n3;
sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11;
};
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 91692bb..0d51258 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1346,8 +1346,8 @@ namespace {
// TabPage for Redlining
struct CharAttr
{
sal_uInt16 const nItemId;
sal_uInt16 const nAttr;
sal_uInt16 nItemId;
sal_uInt16 nAttr;
};
}
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 75de088..a5fd9bd 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -36,7 +36,7 @@ struct SwCSVData
class SwFindEntryDialog;
class SwCreateAddressListDialog : public SfxDialogController
{
OUString const m_sAddressListFilterName;
OUString m_sAddressListFilterName;
OUString m_sURL;
std::unique_ptr<SwCSVData> m_pCSVData;
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 64f6c46..4d5248a 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -96,9 +96,9 @@ struct DB_Column
const enum class Type { FILLTEXT, COL_FIELD, COL_TEXT, SPLITPARA } eColType;
union {
OUString* const pText;
OUString* pText;
SwField* pField;
sal_uInt32 const nFormat;
sal_uInt32 nFormat;
};
const SwInsDBColumn* pColInfo;
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 6d173043..d55b0cf 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -195,7 +195,7 @@ private:
OUString m_sCurrentText;
SwMailMergeConfigItem& m_rConfigItem;
DialogType const m_eType;
DialogType m_eType;
Idle m_aSelectionChangedIdle;
@@ -246,8 +246,8 @@ public:
class SwAssignFieldsControl;
class SwAssignFieldsDialog : public SfxDialogController
{
OUString const m_sNone;
OUString const m_rPreviewString;
OUString m_sNone;
OUString m_rPreviewString;
SwMailMergeConfigItem& m_rConfigItem;
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index bc762ef..8f3cf43 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -36,7 +36,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > const & xM
static const struct SwLabItemMap {
const char* pName;
OUString SwLabItem:: * const pValue;
OUString SwLabItem:: *pValue;
} aArr[] = {
{ "BC_PRIV_FIRSTNAME" , &SwLabItem::m_aPrivFirstName },
{ "BC_PRIV_NAME" , &SwLabItem::m_aPrivName },
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index d11e4a1..8e6d6a1 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -31,16 +31,16 @@ class SwLabFormatPage;
class SwLabPreview : public weld::CustomWidgetController
{
Color const m_aGrayColor;
Color m_aGrayColor;
OUString const m_aHDistStr;
OUString const m_aVDistStr;
OUString const m_aWidthStr;
OUString const m_aHeightStr;
OUString const m_aLeftStr;
OUString const m_aUpperStr;
OUString const m_aColsStr;
OUString const m_aRowsStr;
OUString m_aHDistStr;
OUString m_aVDistStr;
OUString m_aWidthStr;
OUString m_aHeightStr;
OUString m_aLeftStr;
OUString m_aUpperStr;
OUString m_aColsStr;
OUString m_aRowsStr;
long m_lHDistWidth;
long m_lVDistWidth;
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 779d1d4..7ed9fe6 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -46,7 +46,7 @@ namespace {
class SwSequenceOptionDialog : public weld::GenericDialogController
{
SwView& m_rView;
OUString const m_aFieldTypeName;
OUString m_aFieldTypeName;
std::unique_ptr<weld::ComboBox> m_xLbLevel;
std::unique_ptr<weld::Entry> m_xEdDelim;
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 00188e1..c9fd242 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -81,8 +81,8 @@ namespace {
struct StringIdPair_Impl
{
SvxSwFramePosString::StringId const eHori;
SvxSwFramePosString::StringId const eVert;
SvxSwFramePosString::StringId eHori;
SvxSwFramePosString::StringId eVert;
};
}
@@ -131,20 +131,20 @@ namespace {
struct RelationMap
{
SvxSwFramePosString::StringId const eStrId;
SvxSwFramePosString::StringId const eMirrorStrId;
LB const nLBRelation;
sal_Int16 const nRelation;
SvxSwFramePosString::StringId eStrId;
SvxSwFramePosString::StringId eMirrorStrId;
LB nLBRelation;
sal_Int16 nRelation;
};
}
struct FrameMap
{
SvxSwFramePosString::StringId const eStrId;
SvxSwFramePosString::StringId const eMirrorStrId;
sal_Int16 const nAlign;
LB const nLBRelations;
SvxSwFramePosString::StringId eStrId;
SvxSwFramePosString::StringId eMirrorStrId;
sal_Int16 nAlign;
LB nLBRelations;
};
@@ -2113,7 +2113,7 @@ void SwFramePage::Init(const SfxItemSet& rSet)
const SvGlobalName& rFactNm( pSh->GetOLEObject()->getClassID() );
static struct GlobalNameId {
sal_uInt32 const n1;
sal_uInt32 n1;
sal_uInt16 n2, n3;
sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15;
} const aGlbNmIds[] = { { SO3_SM_CLASSID_60 }, { SO3_SM_CLASSID_50 },
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 6c02488..324ee3b 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -86,7 +86,7 @@ public:
/// Dialog implementing the sending as email of the result document.
class SwMMResultEmailDialog : public SfxDialogController
{
OUString const m_sConfigureMail;
OUString m_sConfigureMail;
OUString m_sCC;
OUString m_sBCC;
OUString m_sBody;
@@ -150,7 +150,7 @@ class SwSendMailDialog : public weld::GenericDialogController
bool m_bDestructionEnabled;
std::unique_ptr<SwSendMailDialog_Impl> m_pImpl;
SwMailMergeConfigItem* const m_pConfigItem;
SwMailMergeConfigItem* m_pConfigItem;
sal_Int32 m_nExpectedCount;
sal_Int32 m_nSendCount;
sal_Int32 m_nErrorCount;
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 1feac61..8984c56 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -33,7 +33,7 @@ class SwEndNoteOptionPage : public SfxTabPage
OUString aNumChapter;
SwWrtShell *pSh;
bool bPosDoc;
bool const bEndNote;
bool bEndNote;
std::unique_ptr<SwNumberingTypeListBox> m_xNumViewBox;
std::unique_ptr<weld::Label> m_xOffsetLbl;
diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx
index f74e77f..7b66b6b 100644
--- a/sw/source/ui/vba/vbaaddin.hxx
+++ b/sw/source/ui/vba/vbaaddin.hxx
@@ -27,7 +27,7 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XAddin > SwVbaAddin_BA
class SwVbaAddin : public SwVbaAddin_BASE
{
private:
OUString const msFileURL;
OUString msFileURL;
bool mbInstalled;
public:
diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx
index e6130fc..6333354 100644
--- a/sw/source/ui/vba/vbabookmark.hxx
+++ b/sw/source/ui/vba/vbabookmark.hxx
@@ -30,7 +30,7 @@ class SwVbaBookmark : public SwVbaBookmark_BASE
private:
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::text::XTextContent > mxBookmark;
OUString const maBookmarkName;
OUString maBookmarkName;
bool mbValid;
private:
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 687a325..5561bbf 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -45,7 +45,7 @@ class SwVbaBorder : public SwVbaBorder_Base
{
private:
uno::Reference< beans::XPropertySet > m_xProps;
sal_Int32 const m_LineType;
sal_Int32 m_LineType;
void setBorderLine( table::BorderLine const & rBorderLine )
{
table::TableBorder aTableBorder;
@@ -229,7 +229,7 @@ class RangeBorders : public RangeBorders_Base
private:
uno::Reference< table::XCellRange > m_xRange;
uno::Reference< uno::XComponentContext > m_xContext;
VbaPalette const m_Palette;
VbaPalette m_Palette;
sal_Int32 getTableIndex( sal_Int32 nConst )
{
// okay return position of the index in the table
diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx
index 5d5b994..9c9e752 100644
--- a/sw/source/ui/vba/vbacell.hxx
+++ b/sw/source/ui/vba/vbacell.hxx
@@ -29,8 +29,8 @@ class SwVbaCell : public SwVbaCell_BASE
{
private:
css::uno::Reference< css::text::XTextTable > mxTextTable;
sal_Int32 const mnColumn;
sal_Int32 const mnRow;
sal_Int32 mnColumn;
sal_Int32 mnRow;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index 9bb2a14..72daf25 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -57,10 +57,10 @@ private:
uno::Reference< XHelperInterface > mxParent;
uno::Reference< uno::XComponentContext > mxContext;
uno::Reference< css::text::XTextTable > mxTextTable;
sal_Int32 const mnLeft;
sal_Int32 const mnTop;
sal_Int32 const mnRight;
sal_Int32 const mnBottom;
sal_Int32 mnLeft;
sal_Int32 mnTop;
sal_Int32 mnRight;
sal_Int32 mnBottom;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx
index 7438117..e9de9f5 100644
--- a/sw/source/ui/vba/vbacells.hxx
+++ b/sw/source/ui/vba/vbacells.hxx
@@ -29,8 +29,8 @@ class SwVbaCells : public SwVbaCells_BASE
{
private:
css::uno::Reference< css::text::XTextTable > mxTextTable;
sal_Int32 const mnTop;
sal_Int32 const mnBottom;
sal_Int32 mnTop;
sal_Int32 mnBottom;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx
index 3e865d6..2c05f3b 100644
--- a/sw/source/ui/vba/vbacolumn.hxx
+++ b/sw/source/ui/vba/vbacolumn.hxx
@@ -29,7 +29,7 @@ class SwVbaColumn : public SwVbaColumn_BASE
{
private:
css::uno::Reference< css::text::XTextTable > mxTextTable;
sal_Int32 const mnIndex;
sal_Int32 mnIndex;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx
index 4eab159..c161b5d 100644
--- a/sw/source/ui/vba/vbadialog.cxx
+++ b/sw/source/ui/vba/vbadialog.cxx
@@ -26,7 +26,7 @@ namespace {
struct WordDialogTable
{
sal_Int32 const wdDialog;
sal_Int32 wdDialog;
const char* ooDialog;
};
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index 5274a61..5c8dea1 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -45,7 +45,7 @@ namespace {
class DocumentEnumImpl : public EnumerationHelperImpl
{
uno::Any const m_aApplication;
uno::Any m_aApplication;
public:
/// @throws uno::RuntimeException
DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {}
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 056d7cee..6e3aef2 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -72,7 +72,7 @@ namespace {
class SwVbaReadFieldParams
{
private:
OUString const aData;
OUString aData;
sal_Int32 nLen, nFnd, nNext, nSavPtr;
OUString aFieldName;
public:
diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx
index d652231..fd3a3dea4 100644
--- a/sw/source/ui/vba/vbaheaderfooter.hxx
+++ b/sw/source/ui/vba/vbaheaderfooter.hxx
@@ -30,8 +30,8 @@ class SwVbaHeaderFooter : public SwVbaHeaderFooter_BASE
private:
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps;
bool const mbHeader;
sal_Int32 const mnIndex;
bool mbHeader;
sal_Int32 mnIndex;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index 246b408..03a997d 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -33,7 +33,7 @@ private:
uno::Reference< uno::XComponentContext > mxContext;
uno::Reference< frame::XModel > mxModel;
uno::Reference< beans::XPropertySet > mxPageStyleProps;
bool const mbHeader;
bool mbHeader;
public:
HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {}
diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx
index 3c6336d..44aa77c 100644
--- a/sw/source/ui/vba/vbaheadersfooters.hxx
+++ b/sw/source/ui/vba/vbaheadersfooters.hxx
@@ -29,7 +29,7 @@ class SwVbaHeadersFooters : public SwVbaHeadersFooters_BASE
private:
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps;
bool const mbHeader;
bool mbHeader;
public:
SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader );
diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx
index b139e87..187cdd4 100644
--- a/sw/source/ui/vba/vbalistgallery.hxx
+++ b/sw/source/ui/vba/vbalistgallery.hxx
@@ -29,7 +29,7 @@ class SwVbaListGallery : public SwVbaListGallery_BASE
{
private:
css::uno::Reference< css::text::XTextDocument > mxTextDocument;
sal_Int32 const mnType;
sal_Int32 mnType;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx
index f076692d..16c6f9d 100644
--- a/sw/source/ui/vba/vbalisthelper.hxx
+++ b/sw/source/ui/vba/vbalisthelper.hxx
@@ -26,8 +26,8 @@ private:
css::uno::Reference< css::container::XIndexReplace > mxNumberingRules;
css::uno::Reference< css::container::XNameContainer > mxStyleFamily;
css::uno::Reference< css::beans::XPropertySet > mxStyleProps;
sal_Int32 const mnGalleryType;
sal_Int32 const mnTemplateType;
sal_Int32 mnGalleryType;
sal_Int32 mnTemplateType;
OUString msStyleName;
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx
index f9f5e03..f149a71 100644
--- a/sw/source/ui/vba/vbalistlevel.hxx
+++ b/sw/source/ui/vba/vbalistlevel.hxx
@@ -29,7 +29,7 @@ class SwVbaListLevel : public SwVbaListLevel_BASE
{
private:
SwVbaListHelperRef pListHelper;
sal_Int32 const mnLevel;
sal_Int32 mnLevel;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx
index f3a212b..ce5674f 100644
--- a/sw/source/ui/vba/vbalistlevels.hxx
+++ b/sw/source/ui/vba/vbalistlevels.hxx
@@ -28,7 +28,7 @@ typedef CollTestImplHelper< ooo::vba::word::XListLevels > SwVbaListLevels_BASE;
class SwVbaListLevels : public SwVbaListLevels_BASE
{
private:
SwVbaListHelperRef const pListHelper;
SwVbaListHelperRef pListHelper;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx
index 270e2cc..d9d4e9d 100644
--- a/sw/source/ui/vba/vbalisttemplates.hxx
+++ b/sw/source/ui/vba/vbalisttemplates.hxx
@@ -29,7 +29,7 @@ class SwVbaListTemplates : public SwVbaListTemplates_BASE
{
private:
css::uno::Reference< css::text::XTextDocument > mxTextDocument;
sal_Int32 const mnGalleryType;
sal_Int32 mnGalleryType;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx
index 8662832..7c6e6f3 100644
--- a/sw/source/ui/vba/vbarow.hxx
+++ b/sw/source/ui/vba/vbarow.hxx
@@ -32,7 +32,7 @@ private:
css::uno::Reference< css::text::XTextTable > mxTextTable;
css::uno::Reference< css::table::XTableRows > mxTableRows;
css::uno::Reference< css::beans::XPropertySet > mxRowProps;
sal_Int32 const mnIndex;
sal_Int32 mnIndex;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 32cf08c..bfebbb8 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -35,9 +35,9 @@ namespace {
struct BuiltinStyleTable
{
sal_Int32 const wdBuiltinStyle;
const char* pOOoStyleName;
sal_Int32 const wdStyleType;
sal_Int32 wdBuiltinStyle;
const sal_Char* pOOoStyleName;
sal_Int32 wdStyleType;
};
}
diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx
index 2798c5e..5765c06 100644
--- a/sw/source/ui/vba/vbatemplate.hxx
+++ b/sw/source/ui/vba/vbatemplate.hxx
@@ -27,7 +27,7 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTemplate > SwVbaTempl
class SwVbaTemplate : public SwVbaTemplate_BASE
{
private:
OUString const msFullUrl;
OUString msFullUrl;
public:
SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
const OUString& );
diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx
index c69ddfc..a278ed1 100644
--- a/sw/source/ui/vba/vbavariable.hxx
+++ b/sw/source/ui/vba/vbavariable.hxx
@@ -29,7 +29,7 @@ class SwVbaVariable : public SwVbaVariable_BASE
{
private:
css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined;
OUString const maVariableName;
OUString maVariableName;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index b31edfe..530e238 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -557,11 +557,11 @@ public:
VclPtr<SfxAbstractApplyTabDialog> m_pDlg;
private:
SwDocShell &m_rDocSh;
bool const m_bNew;
bool m_bNew;
rtl::Reference< SwDocStyleSheet > m_xTmp;
SfxStyleFamily const m_nFamily;
SfxStyleFamily m_nFamily;
rtl::Reference< SfxStyleSheetBasePool > m_xBasePool;
bool const m_bModified;
bool m_bModified;
};
}
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 4ba9fc6..6335cde 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -530,8 +530,8 @@ void SwViewOption::SetAppearanceFlag(ViewOptFlags nFlag, bool bSet, bool bSaveIn
svtools::EditableColorConfig aEditableConfig;
struct FlagToConfig_Impl
{
ViewOptFlags const nFlag;
svtools::ColorConfigEntry const eEntry;
ViewOptFlags nFlag;
svtools::ColorConfigEntry eEntry;
};
static const FlagToConfig_Impl aFlags[] =
{
diff --git a/sw/source/uibase/dbui/maildispatcher.cxx b/sw/source/uibase/dbui/maildispatcher.cxx
index 185d0d7..10d8ea7 100644
--- a/sw/source/uibase/dbui/maildispatcher.cxx
+++ b/sw/source/uibase/dbui/maildispatcher.cxx
@@ -63,7 +63,7 @@ namespace /* private */
private:
::rtl::Reference<MailDispatcher> mail_dispatcher_;
uno::Reference<mail::XMailMessage> message_;
OUString const error_message_;
OUString error_message_;
};
} // namespace private
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index e36ac4e..860a926 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -53,9 +53,9 @@ namespace {
struct TextBlockInfo_Impl
{
OUString const sTitle;
OUString const sLongName;
OUString const sGroupName;
OUString sTitle;
OUString sLongName;
OUString sGroupName;
TextBlockInfo_Impl(OUString const& rTitle, OUString const& rLongName, OUString const& rGroupName)
: sTitle(rTitle), sLongName(rLongName), sGroupName(rGroupName) {}
};
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index 70bfe99..77609c0 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -39,16 +39,16 @@ namespace {
class AnchorPrimitive : public drawinglayer::primitive2d::DiscreteMetricDependentPrimitive2D
{
private:
basegfx::B2DPolygon const maTriangle;
basegfx::B2DPolygon const maLine;
basegfx::B2DPolygon const maLineTop;
basegfx::B2DPolygon maTriangle;
basegfx::B2DPolygon maLine;
basegfx::B2DPolygon maLineTop;
const AnchorState maAnchorState;
basegfx::BColor const maColor;
basegfx::BColor maColor;
// discrete line width
double const mfDiscreteLineWidth;
double mfDiscreteLineWidth;
bool const mbLineSolid : 1;
bool mbLineSolid : 1;
protected:
virtual void create2DDecomposition(
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 9d691e4..2c96a04 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1343,7 +1343,7 @@ public:
class IsPostitFieldWithAuthorOf : public FilterFunctor
{
OUString const m_sAuthor;
OUString m_sAuthor;
public:
explicit IsPostitFieldWithAuthorOf(const OUString &rAuthor)
: m_sAuthor(rAuthor)
@@ -1359,7 +1359,7 @@ public:
class IsPostitFieldWithPostitId : public FilterFunctor
{
sal_uInt32 const m_nPostItId;
sal_uInt32 m_nPostItId;
public:
explicit IsPostitFieldWithPostitId(sal_uInt32 nPostItId)
: m_nPostItId(nPostItId)
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
index d0242df..65ccda7 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
@@ -41,9 +41,9 @@ namespace {
class ShadowPrimitive : public drawinglayer::primitive2d::DiscreteMetricDependentPrimitive2D
{
private:
basegfx::B2DPoint const maBasePosition;
basegfx::B2DPoint const maSecondPosition;
ShadowState const maShadowState;
basegfx::B2DPoint maBasePosition;
basegfx::B2DPoint maSecondPosition;
ShadowState maShadowState;
protected:
virtual void create2DDecomposition(
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index d60b347..ff203c6 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -196,7 +196,7 @@ static bool lcl_goIntoTextBox(SwEditWin& rEditWin, SwWrtShell& rSh)
class SwAnchorMarker
{
SdrHdl* pHdl;
Point const aHdlPos;
Point aHdlPos;
Point aLastPos;
bool bTopRightHandle;
public:
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index 018eb68..7c6c2c0 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.hxx
@@ -33,28 +33,28 @@ class SwReadOnlyPopup
{
VclBuilder m_aBuilder;
ScopedVclPtr<PopupMenu> m_xMenu;
sal_uInt16 const m_nReadonlyOpenurl;
sal_uInt16 const m_nReadonlyOpendoc;
sal_uInt16 const m_nReadonlyEditdoc;
sal_uInt16 const m_nReadonlySelectionMode;
sal_uInt16 const m_nReadonlyReload;
sal_uInt16 const m_nReadonlyReloadFrame;
sal_uInt16 const m_nReadonlySourceview;
sal_uInt16 const m_nReadonlyBrowseBackward;
sal_uInt16 const m_nReadonlyBrowseForward;
sal_uInt16 const m_nReadonlySaveGraphic;
sal_uInt16 const m_nReadonlyGraphictogallery;
sal_uInt16 const m_nReadonlyTogallerylink;
sal_uInt16 const m_nReadonlyTogallerycopy;
sal_uInt16 const m_nReadonlySaveBackground;
sal_uInt16 const m_nReadonlyBackgroundtogallery;
sal_uInt16 const m_nReadonlyBackgroundTogallerylink;
sal_uInt16 const m_nReadonlyBackgroundTogallerycopy;
sal_uInt16 const m_nReadonlyCopylink;
sal_uInt16 const m_nReadonlyLoadGraphic;
sal_uInt16 const m_nReadonlyGraphicoff;
sal_uInt16 const m_nReadonlyFullscreen;
sal_uInt16 const m_nReadonlyCopy;
sal_uInt16 m_nReadonlyOpenurl;
sal_uInt16 m_nReadonlyOpendoc;
sal_uInt16 m_nReadonlyEditdoc;
sal_uInt16 m_nReadonlySelectionMode;
sal_uInt16 m_nReadonlyReload;
sal_uInt16 m_nReadonlyReloadFrame;
sal_uInt16 m_nReadonlySourceview;
sal_uInt16 m_nReadonlyBrowseBackward;
sal_uInt16 m_nReadonlyBrowseForward;
sal_uInt16 m_nReadonlySaveGraphic;
sal_uInt16 m_nReadonlyGraphictogallery;
sal_uInt16 m_nReadonlyTogallerylink;
sal_uInt16 m_nReadonlyTogallerycopy;
sal_uInt16 m_nReadonlySaveBackground;
sal_uInt16 m_nReadonlyBackgroundtogallery;
sal_uInt16 m_nReadonlyBackgroundTogallerylink;
sal_uInt16 m_nReadonlyBackgroundTogallerycopy;
sal_uInt16 m_nReadonlyCopylink;
sal_uInt16 m_nReadonlyLoadGraphic;
sal_uInt16 m_nReadonlyGraphicoff;
sal_uInt16 m_nReadonlyFullscreen;
sal_uInt16 m_nReadonlyCopy;
SwView &m_rView;
std::shared_ptr<SvxBrushItem> m_aBrushItem;
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index dbb6d9e..ff6b782 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -280,13 +280,13 @@ namespace {
// field types and subtypes
struct SwFieldPack
{
SwFieldTypesEnum const nTypeId;
SwFieldTypesEnum nTypeId;
const char** pSubTypeResIds;
size_t const nSubTypeLength;
const char** pSubTypeResIds;
size_t nSubTypeLength;
const char** pFormatResIds;
size_t const nFormatLength;
const char** pFormatResIds;
size_t nFormatLength;
};
}
diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx
index b0d1364..0492be6 100644
--- a/sw/source/uibase/inc/DashedLine.hxx
+++ b/sw/source/uibase/inc/DashedLine.hxx
@@ -15,7 +15,7 @@
*/
class SwDashedLine : public FixedLine
{
Color& (* const m_pColorFn)();
Color& (*m_pColorFn)();
public:
SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() );
diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx
index 4410073..dc1cee8 100644
--- a/sw/source/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/uibase/inc/HeaderFooterWin.hxx
@@ -36,7 +36,7 @@ class SwHeaderFooterWin : public SwFrameMenuButtonBase
{
VclBuilder m_aBuilder;
OUString m_sLabel;
bool const m_bIsHeader;
bool m_bIsHeader;
VclPtr<PopupMenu> m_pPopupMenu;
VclPtr<vcl::Window> m_pLine;
bool m_bIsAppearing;
diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx
index 1d6bc7e..9c07ce2 100644
--- a/sw/source/uibase/inc/break.hxx
+++ b/sw/source/uibase/inc/break.hxx
@@ -41,7 +41,7 @@ class SwBreakDlg : public weld::GenericDialogController
sal_uInt16 nKind;
::std::optional<sal_uInt16> oPgNum;
bool const bHtmlMode;
bool bHtmlMode;
DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
DECL_LINK(ChangeHdl, weld::ComboBox&, void);
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx
index 660d60d..09138b5 100644
--- a/sw/source/uibase/inc/chrdlg.hxx
+++ b/sw/source/uibase/inc/chrdlg.hxx
@@ -28,7 +28,7 @@ class SvxMacroItem;
class SwCharDlg : public SfxTabDialogController
{
SwView& m_rView;
SwCharDlgMode const m_nDialogMode;
SwCharDlgMode m_nDialogMode;
public:
SwCharDlg(weld::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index b755186..41f7e41 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.hxx
@@ -87,7 +87,7 @@ class SW_DLLPUBLIC SwColumnOnlyExample : public weld::CustomWidgetController
private:
Size m_aWinSize;
Size const m_aFrameSize;
Size m_aFrameSize;
SwFormatCol m_aCols;
protected:
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index c0d4e22..414db70 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -35,9 +35,9 @@ class SwRangeRedline;
class SwOutlineContent : public SwContent
{
SwOutlineNodes::size_type const nOutlinePos;
sal_uInt8 const nOutlineLevel;
bool const bIsMoveable;
SwOutlineNodes::size_type nOutlinePos;
sal_uInt8 nOutlineLevel;
bool bIsMoveable;
public:
SwOutlineContent( const SwContentType* pCnt,
const OUString& rName,
@@ -56,7 +56,7 @@ class SwOutlineContent : public SwContent
class SwRegionContent : public SwContent
{
sal_uInt8 const nRegionLevel;
sal_uInt8 nRegionLevel;
public:
SwRegionContent( const SwContentType* pCnt,
@@ -70,7 +70,7 @@ class SwRegionContent : public SwContent
class SwURLFieldContent : public SwContent
{
OUString const sURL;
OUString sURL;
const SwTextINetFormat* pINetAttr;
public:
@@ -105,7 +105,7 @@ public:
class SwGraphicContent : public SwContent
{
OUString const sLink;
OUString sLink;
public:
SwGraphicContent(const SwContentType* pCnt, const OUString& rName, const OUString& rLink, long nYPos)
: SwContent( pCnt, rName, nYPos ), sLink( rLink )
@@ -140,11 +140,11 @@ class SwContentType : public SwTypeNumber
SwWrtShell* m_pWrtShell;
std::unique_ptr<SwContentArr>
m_pMember; // array for content
OUString const m_sContentTypeName; // name of content type
OUString const m_sSingleContentTypeName; // name of content type, singular
OUString m_sContentTypeName; // name of content type
OUString m_sSingleContentTypeName; // name of content type, singular
OUString m_sTypeToken; // attachment for URL
size_t m_nMemberCount; // content count
ContentTypeId const m_nContentType; // content type's Id
ContentTypeId m_nContentType; // content type's Id
sal_uInt8 m_nOutlineLevel;
bool m_bDataValid : 1;
bool m_bEdit: 1; // can this type be edited?
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index c42b081..3cb48bc 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -73,22 +73,22 @@ class SwContentTree final
, public SfxListener
{
VclPtr<SwNavigationPI> m_xDialog;
OUString const m_sSpace;
OUString m_sSpace;
AutoTimer m_aUpdTimer;
o3tl::enumarray<ContentTypeId,std::unique_ptr<SwContentType>> m_aActiveContentArr;
o3tl::enumarray<ContentTypeId,std::unique_ptr<SwContentType>> m_aHiddenContentArr;
OUString m_aContextStrings[CONTEXT_COUNT + 1];
OUString const m_sRemoveIdx;
OUString const m_sUpdateIdx;
OUString const m_sUnprotTable;
OUString const m_sRename;
OUString const m_sReadonlyIdx;
OUString const m_sInvisible;
OUString const m_sPostItShow;
OUString const m_sPostItHide;
OUString const m_sPostItDelete;
OUString const m_sProtected;
OUString m_sRemoveIdx;
OUString m_sUpdateIdx;
OUString m_sUnprotTable;
OUString m_sRename;
OUString m_sReadonlyIdx;
OUString m_sInvisible;
OUString m_sPostItShow;
OUString m_sPostItHide;
OUString m_sPostItDelete;
OUString m_sProtected;
SwWrtShell* m_pHiddenShell; // dropped Doc
SwWrtShell* m_pActiveShell; // the active or a const. open view
diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx
index 899575b..08a831b 100644
--- a/sw/source/uibase/inc/convert.hxx
+++ b/sw/source/uibase/inc/convert.hxx
@@ -49,7 +49,7 @@ class SwConvertTableDlg : public SfxDialogController
std::unique_ptr<weld::Button> m_xAutoFormatBtn;
std::unique_ptr<SwTableAutoFormat> mxTAutoFormat;
SwWrtShell* const pShell;
SwWrtShell* pShell;
DECL_LINK(AutoFormatHdl, weld::Button&, void);
DECL_LINK(BtnHdl, weld::Button&, void);
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 58fffc2..cc99224 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -31,7 +31,7 @@ class SwView;
class SwCaptionDialog : public SfxDialogController
{
OUString const m_sNone;
OUString m_sNone;
TextFilterAutoConvert m_aTextFilter;
SwView &rView; // search per active, avoid View
std::unique_ptr<SwFieldMgr> pMgr; // pointer to save the include
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 4815a44..25175f9 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -81,7 +81,7 @@ class SwInsertDBColAutoPilot : public SfxDialogController, public utl::ConfigIte
SwInsDBColumns aDBColumns;
const SwDBData aDBData;
OUString const sNoTmpl;
OUString sNoTmpl;
SwView* pView;
std::unique_ptr<SwTableAutoFormat> m_xTAutoFormat;
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index ca14204..2ff0814 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.hxx
@@ -55,8 +55,8 @@ class SwDropCapsPict : public weld::CustomWidgetController
struct ScriptInfo
{
sal_uLong textWidth; ///< Physical width of this segment.
sal_uInt16 const scriptType; ///< Script type (e.g. Latin, Asian, Complex)
sal_Int32 const changePos; ///< Character position where the script changes.
sal_uInt16 scriptType; ///< Script type (e.g. Latin, Asian, Complex)
sal_Int32 changePos; ///< Character position where the script changes.
ScriptInfo(sal_uInt16 scrptType, sal_Int32 position)
: textWidth(0), scriptType(scrptType), changePos(position) {}
};
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 6046e9c..29ad3d7 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -60,23 +60,23 @@ enum SwFieldGroups
struct SwFieldGroupRgn
{
sal_uInt16 const nStart;
sal_uInt16 const nEnd;
sal_uInt16 nStart;
sal_uInt16 nEnd;
};
// the field manager handles the insertation of fields
// with command strings
struct SwInsertField_Data
{
SwFieldTypesEnum const m_nTypeId;
sal_uInt16 const m_nSubType;
SwFieldTypesEnum m_nTypeId;
sal_uInt16 m_nSubType;
const OUString m_sPar1;
const OUString m_sPar2;
sal_uInt32 const m_nFormatId;
SwWrtShell* const m_pSh;
sal_Unicode const m_cSeparator;
bool const m_bIsAutomaticLanguage;
css::uno::Any const m_aDBDataSource;
sal_uInt32 m_nFormatId;
SwWrtShell* m_pSh;
sal_Unicode m_cSeparator;
bool m_bIsAutomaticLanguage;
css::uno::Any m_aDBDataSource;
css::uno::Any m_aDBConnection;
css::uno::Any m_aDBColumn;
weld::Widget* m_pParent; // parent widget used for SwWrtShell::StartInputFieldDlg()
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index d14710d..e3c079a 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -28,10 +28,10 @@ class SwWrtShell;
// frame dialog
class SwFrameDlg : public SfxTabDialogController
{
bool const m_bFormat;
bool const m_bNew;
bool m_bFormat;
bool m_bNew;
const SfxItemSet& m_rSet;
OUString const m_sDlgType;
OUString m_sDlgType;
SwWrtShell* m_pWrtShell;
virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx
index bdd26ed..dd876c3 100644
--- a/sw/source/uibase/inc/gloshdl.hxx
+++ b/sw/source/uibase/inc/gloshdl.hxx
@@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwGlossaryHdl
SwGlossaries& rStatGlossaries;
OUString aCurGrp;
SfxViewFrame* const pViewFrame;
SfxViewFrame* pViewFrame;
SwWrtShell* pWrtShell;
std::unique_ptr<SwTextBlocks>
pCurGrp;
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index 866239a..9b2d26d 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -31,7 +31,7 @@ private:
SwView* pView;
sal_uInt16 nPageCount; // page count for progress view
sal_uInt16 nPageStart; // 1st checked page
bool const bInSelection : 1; // separating selected text
bool bInSelection : 1; // separating selected text
bool bAutomatic : 1; // insert separators without further inquiry
bool bInfoBox : 1; // display info-box when ending
diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx
index cb4dde5..6ea4cc3 100644
--- a/sw/source/uibase/inc/insfnote.hxx
+++ b/sw/source/uibase/inc/insfnote.hxx
@@ -33,7 +33,7 @@ class SwInsFootNoteDlg: public weld::GenericDialogController
OUString m_aFontName;
rtl_TextEncoding m_eCharSet;
bool m_bExtCharAvailable;
bool const m_bEdit;
bool m_bEdit;
std::unique_ptr<weld::Widget> m_xNumberFrame;
std::unique_ptr<weld::RadioButton> m_xNumberAutoBtn;
diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx
index 463f4e3..86d08a2 100644
--- a/sw/source/uibase/inc/label.hxx
+++ b/sw/source/uibase/inc/label.hxx
@@ -32,7 +32,7 @@ class Printer;
class SwLabDlg : public SfxTabDialogController
{
SwLabelConfig aLabelsCfg;
SwDBManager* const pDBManager;
SwDBManager* pDBManager;
SwLabPrtPage* m_pPrtPage;
std::vector<sal_uInt16> aTypeIds;
@@ -41,7 +41,7 @@ class SwLabDlg : public SfxTabDialogController
std::unique_ptr<SwLabRecs> m_pRecs;
OUString aLstGroup;
OUString m_sBusinessCardDlg;
bool const m_bLabel;
bool m_bLabel;
void ReplaceGroup_( const OUString &rMake );
virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 8456f8d..ec01bf3 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -106,7 +106,7 @@ class SwLabCfgItem : public utl::ConfigItem
{
private:
SwLabItem aItem;
bool const bIsLabel;
bool bIsLabel;
css::uno::Sequence<OUString> GetPropertyNames() const;
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index dc933e9..88bd4bb 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -136,7 +136,7 @@ public:
class SW_DLLPUBLIC SwAuthenticator :
public cppu::WeakImplHelper<css::mail::XAuthenticator>
{
OUString const m_aUserName;
OUString m_aUserName;
OUString m_aPassword;
weld::Window* m_pParentWindow;
public:
@@ -157,9 +157,9 @@ public:
class SW_DLLPUBLIC SwConnectionContext : public cppu::WeakImplHelper<css::uno::XCurrentContext>
{
OUString const m_sMailServer;
sal_Int16 const m_nPort;
OUString const m_sConnectionType;
OUString m_sMailServer;
sal_Int16 m_nPort;
OUString m_sConnectionType;
public:
SwConnectionContext(const OUString& rMailServer, sal_Int16 nPort, const OUString& rConnectionType);
@@ -197,11 +197,11 @@ class SW_DLLPUBLIC SwMailTransferable :
public SwMutexBase,
public cppu::WeakComponentImplHelper<css::datatransfer::XTransferable, css::beans::XPropertySet>
{
OUString const m_aMimeType;
OUString const m_sBody;
OUString const m_aURL;
OUString const m_aName;
bool const m_bIsBody;
OUString m_aMimeType;
OUString m_sBody;
OUString m_aURL;
OUString m_aName;
bool m_bIsBody;
public:
SwMailTransferable(const OUString& rURL, const OUString& rName, const OUString& rMimeType);
diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx
index 27fbe44..0ab3c8d 100644
--- a/sw/source/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/uibase/inc/mailmergewizard.hxx
@@ -36,18 +36,18 @@ using vcl::WizardTypes::CommitPageReason;
class SwMailMergeWizard : public ::vcl::RoadmapWizardMachine
{
SwView* const m_pSwView;
SwView* m_pSwView;
OUString sDocumentURL;
bool m_bDocumentLoad;
std::shared_ptr<SwMailMergeConfigItem> m_xConfigItem;
OUString const m_sStarting;
OUString const m_sDocumentType;
OUString const m_sAddressBlock;
OUString const m_sAddressList;
OUString const m_sGreetingsLine;
OUString const m_sLayout;
OUString m_sStarting;
OUString m_sDocumentType;
OUString m_sAddressBlock;
OUString m_sAddressList;
OUString m_sGreetingsLine;
OUString m_sLayout;
sal_uInt16 m_nRestartPage;
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index a357ff4..a0ab9d5 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.hxx
@@ -77,18 +77,18 @@ class SW_DLLPUBLIC SwSpellPopup
{
VclBuilder m_aBuilder;
VclPtr<PopupMenu> m_xPopupMenu;
sal_uInt16 const m_nIgnoreWordId;
sal_uInt16 const m_nAddMenuId;
sal_uInt16 const m_nAddId;
sal_uInt16 const m_nSpellDialogId;
sal_uInt16 const m_nCorrectMenuId;
sal_uInt16 const m_nCorrectDialogId;
sal_uInt16 const m_nLangSelectionMenuId;
sal_uInt16 const m_nLangParaMenuId;
sal_uInt16 const m_nRedlineAcceptId;
sal_uInt16 const m_nRedlineRejectId;
sal_uInt16 const m_nRedlineNextId;
sal_uInt16 const m_nRedlinePrevId;
sal_uInt16 m_nIgnoreWordId;
sal_uInt16 m_nAddMenuId;
sal_uInt16 m_nAddId;
sal_uInt16 m_nSpellDialogId;
sal_uInt16 m_nCorrectMenuId;
sal_uInt16 m_nCorrectDialogId;
sal_uInt16 m_nLangSelectionMenuId;
sal_uInt16 m_nLangParaMenuId;
sal_uInt16 m_nRedlineAcceptId;
sal_uInt16 m_nRedlineRejectId;
sal_uInt16 m_nRedlineNextId;
sal_uInt16 m_nRedlinePrevId;
SwWrtShell* m_pSh;
css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > m_aDics;
css::uno::Reference< css::linguistic2::XSpellAlternatives > m_xSpellAlt;
@@ -100,8 +100,8 @@ class SW_DLLPUBLIC SwSpellPopup
std::map< sal_Int16, OUString > m_aLangTable_Text;
std::map< sal_Int16, OUString > m_aLangTable_Paragraph;
OUString m_aDicNameSingle;
bool const m_bGrammarResults; // show grammar results? Or show spellcheck results?
OUString m_aDicNameSingle;
bool m_bGrammarResults; // show grammar results? Or show spellcheck results?
static void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart,
const css::uno::Sequence< OUString >& aSeq, SwWrtShell* pWrtSh,
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 2a6a8a4..1db4fcb 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -45,7 +45,7 @@ class TextFilterAutoConvert : public TextFilter
{
private:
OUString m_sLastGoodText;
OUString const m_sNone;
OUString m_sNone;
public:
TextFilterAutoConvert(const OUString &rNone)
: m_sNone(rNone)
@@ -116,22 +116,22 @@ public:
class SwCaptionOptPage : public SfxTabPage
{
private:
OUString const m_sSWTable;
OUString const m_sSWFrame;
OUString const m_sSWGraphic;
OUString const m_sOLE;
OUString m_sSWTable;
OUString m_sSWFrame;
OUString m_sSWGraphic;
OUString m_sOLE;
OUString m_sIllustration;
OUString m_sTable;
OUString m_sText;
OUString m_sDrawing;
OUString const m_sBegin;
OUString const m_sEnd;
OUString const m_sAbove;
OUString const m_sBelow;
OUString m_sBegin;
OUString m_sEnd;
OUString m_sAbove;
OUString m_sBelow;
OUString const m_sNone;
OUString m_sNone;
int m_nPrevSelectedEntry;
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index afb2a78..73062bb 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -70,7 +70,7 @@ public:
// TabPage printer settings additions
class SwAddPrinterTabPage : public SfxTabPage
{
OUString const sNone;
OUString sNone;
bool bAttrModified;
bool bPreview;
@@ -143,9 +143,9 @@ class SwStdFontTabPage : public SfxTabPage
sal_uInt8 m_nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL]
OUString const m_sScriptWestern;
OUString const m_sScriptAsian;
OUString const m_sScriptComplex;
OUString m_sScriptWestern;
OUString m_sScriptAsian;
OUString m_sScriptComplex;
std::unique_ptr<weld::Label> m_xLabelFT;
std::unique_ptr<weld::ComboBox> m_xStandardBox;
@@ -256,7 +256,7 @@ public:
class SwMarkPreview : public weld::CustomWidgetController
{
Color m_aBgCol; // background
Color const m_aTransCol; // transparency
Color m_aTransCol; // transparency
Color m_aMarkCol; // marks
Color m_aLineCol; // general lines
Color m_aShadowCol; // shadow
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index cf0f181..f9c3c1f 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -40,7 +40,7 @@ class SwOutlineTabDialog final : public SfxTabDialogController
std::unique_ptr<SwNumRule> xNumRule;
SwChapterNumRules* pChapterNumRules;
bool const bModified : 1;
bool bModified : 1;
std::unique_ptr<weld::MenuButton> m_xMenuButton;
@@ -65,7 +65,7 @@ public:
class SwOutlineSettingsTabPage : public SfxTabPage
{
OUString const aNoFormatName;
OUString aNoFormatName;
OUString aSaveCollNames[MAXLEVEL];
SwWrtShell* pSh;
SwNumRule* pNumRule;
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 711d5d9..38f743f 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -170,7 +170,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
// to support keyboard the number of the page to go to can be set too
sal_uInt16 m_nNewPage;
// visible range
OUString const m_sPageStr;
OUString m_sPageStr;
Size m_aDocSize;
tools::Rectangle m_aVisArea;
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 99243b5..6bc6646 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -61,15 +61,15 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg final
SwRedlineDataChildArr m_RedlineChildren;
SwRedlineDataParentSortArr m_aUsedSeqNo;
Timer m_aSelectTimer;
OUString const m_sInserted;
OUString const m_sDeleted;
OUString const m_sFormated;
OUString const m_sTableChgd;
OUString const m_sFormatCollSet;
OUString m_sInserted;
OUString m_sDeleted;
OUString m_sFormated;
OUString m_sTableChgd;
OUString m_sFormatCollSet;
OUString m_sFilterAction;
OUString const m_sAutoFormat;
OUString m_sAutoFormat;
bool m_bOnlyFormatedRedlines;
bool const m_bRedlnAutoFormat;
bool m_bRedlnAutoFormat;
// prevent update dialog data during longer operations (cf #102657#)
bool m_bInhibitActivate;
diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx
index 772011c..fff22eb 100644
--- a/sw/source/uibase/inc/scroll.hxx
+++ b/sw/source/uibase/inc/scroll.hxx
@@ -22,11 +22,11 @@
class SwScrollbar: public ScrollBar
{
Size aDocSz;
bool const bHori :1; // horizontal = salTrue, otherwise vertical
bool bAuto :1; // for scrolling mode
bool bVisible :1; // show/hide should only set this flag
bool bSizeSet :1; // was the size already set?
Size aDocSz;
bool bHori :1; // horizontal = salTrue, otherwise vertical
bool bAuto :1; // for scrolling mode
bool bVisible :1; // show/hide should only set this flag
bool bSizeSet :1; // was the size already set?
void AutoShow();
diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx
index 4ae03f2..2bd51c6 100644
--- a/sw/source/uibase/inc/shdwcrsr.hxx
+++ b/sw/source/uibase/inc/shdwcrsr.hxx
@@ -28,7 +28,7 @@
class SwShadowCursor
{
VclPtr<vcl::Window> pWin;
Color const aCol;
Color aCol;
Point aOldPt;
long nOldHeight;
sal_uInt16 nOldMode;
diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx
index 85bba0a..b4828dc 100644
--- a/sw/source/uibase/inc/srtdlg.hxx
+++ b/sw/source/uibase/inc/srtdlg.hxx
@@ -27,7 +27,7 @@ class SwWrtShell;
class SwSortDlg : public weld::GenericDialogController
{
weld::Window* const m_pParent;
weld::Window* m_pParent;
std::unique_ptr<weld::Label> m_xColLbl;
std::unique_ptr<weld::CheckButton> m_xKeyCB1;
@@ -60,9 +60,9 @@ class SwSortDlg : public weld::GenericDialogController
std::unique_ptr<weld::CheckButton> m_xCaseCB;
OUString const aColText;
OUString const aRowText;
OUString const aNumericText;
OUString aColText;
OUString aRowText;
OUString aNumericText;
SwWrtShell &rSh;
std::unique_ptr<CollatorResource> m_xColRes;
diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx
index cb334f9..76efc6d 100644
--- a/sw/source/uibase/inc/swcont.hxx
+++ b/sw/source/uibase/inc/swcont.hxx
@@ -58,7 +58,7 @@ enum class RegionMode
//mini rtti
class SwTypeNumber
{
sal_uInt8 const nTypeId;
sal_uInt8 nTypeId;
public:
SwTypeNumber(sal_uInt8 nId) :nTypeId(nId){}
@@ -70,8 +70,8 @@ class SwTypeNumber
class SwContent : public SwTypeNumber
{
const SwContentType* pParent;
OUString const sContentName;
long const nYPosition;
OUString sContentName;
long nYPosition;
// some subclasses appear to use this for a tools/gen.hxx-style
// geometric Y position, while e.g. SwOutlineContent wants to store
// the index in its subtree
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index b0deb95..1f78ac1 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -68,12 +68,12 @@ class SwMultiTOXTabDialog : public SfxTabDialogController
CurTOXType m_eCurrentTOXType;
OUString const m_sUserDefinedIndex;
sal_uInt16 const m_nInitialTOXType;
OUString m_sUserDefinedIndex;
sal_uInt16 m_nInitialTOXType;
bool m_bEditTOX;
bool m_bExampleCreated;
bool const m_bGlobalFlag;
bool m_bGlobalFlag;
std::unique_ptr<SwOneExampleFrame> m_xExampleFrame;
std::unique_ptr<weld::CheckButton> m_xShowExampleCB;
@@ -119,7 +119,7 @@ class SwTOXSelectTabPage : public SfxTabPage
OUString aStyleArr[MAXLEVEL];
OUString sAutoMarkURL;
OUString const sAutoMarkType;
OUString sAutoMarkType;
OUString sAddStyleUser;
OUString sAddStyleContent;
@@ -227,7 +227,7 @@ class SwTokenWindow
bool m_bValid;
OUString m_aButtonTexts[TOKEN_END]; // Text of the buttons
OUString m_aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons
OUString const m_sCharStyle;
OUString m_sCharStyle;
Link<SwFormToken&,void> m_aButtonSelectedHdl;
SwTOXWidget* m_pActiveCtrl;
Link<LinkParamNone*,void> m_aModifyHdl;
@@ -302,11 +302,11 @@ private:
class SwTOXEntryTabPage : public SfxTabPage
{
OUString const sDelimStr;
OUString sDelimStr;
OUString sLevelStr;
OUString sAuthTypeStr;
OUString const sNoCharStyle;
OUString sNoCharStyle;
SwForm* m_pCurrentForm;
CurTOXType aLastTOXType;
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index d05819c..2bd2fb4 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -167,7 +167,7 @@ class SwAuthorMarkPane
friend class SwAuthMarkModalDlg;
friend class SwAuthMarkFloatDlg;
bool const bNewEntry;
bool bNewEntry;
bool bBibAccessInitialized;
SwWrtShell* pSh;
diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx
index dd38584..bd282a4 100644
--- a/sw/source/uibase/inc/swuipardlg.hxx
+++ b/sw/source/uibase/inc/swuipardlg.hxx
@@ -26,7 +26,7 @@
class SwParaDlg: public SfxTabDialogController
{
SwView& rView;
bool const bDrawParaDlg;
bool bDrawParaDlg;
void PageCreated(const OString& rId, SfxTabPage& rPage) override;
diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx
index 1cffcc9..45be074 100644
--- a/sw/source/uibase/inc/swwrtshitem.hxx
+++ b/sw/source/uibase/inc/swwrtshitem.hxx
@@ -25,7 +25,7 @@ class SwWrtShell;
class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem
{
SwWrtShell* const pWrtSh;
SwWrtShell* pWrtSh;
public:
SwWrtShellItem( SwWrtShell* pWrtSh );
diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx
index 8db3671..3d4af57 100644
--- a/sw/source/uibase/inc/tabledlg.hxx
+++ b/sw/source/uibase/inc/tabledlg.hxx
@@ -27,7 +27,7 @@ struct TColumn;
// table dialog
class SwTableTabDlg : public SfxTabDialogController
{
SwWrtShell* const pShell;
SwWrtShell* pShell;
virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
public:
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index a5c1bf9..c1f2893 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.hxx
@@ -43,7 +43,7 @@ const char cParaDelim = 0x0a;
class SW_DLLPUBLIC SwTableFUNC
{
SwFrameFormat * const pFormat;
SwFrameFormat *pFormat;
SwWrtShell *pSh;
SwTabCols aCols;
diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx
index 69e9938..8438e57 100644
--- a/sw/source/uibase/inc/tautofmt.hxx
+++ b/sw/source/uibase/inc/tautofmt.hxx
@@ -35,19 +35,19 @@ class SwWrtShell;
class SwAutoFormatDlg : public SfxDialogController
{
OUString const m_aStrTitle;
OUString const m_aStrLabel;
OUString const m_aStrClose;
OUString const m_aStrDelTitle;
OUString const m_aStrDelMsg;
OUString const m_aStrRenameTitle;
OUString const m_aStrInvalidFormat;
OUString m_aStrTitle;
OUString m_aStrLabel;
OUString m_aStrClose;
OUString m_aStrDelTitle;
OUString m_aStrDelMsg;
OUString m_aStrRenameTitle;
OUString m_aStrInvalidFormat;
SwWrtShell* m_pShell;
sal_uInt8 m_nIndex;
sal_uInt8 m_nDfltStylePos;
bool m_bCoreDataChanged : 1;
bool const m_bSetAutoFormat : 1;
bool m_bSetAutoFormat : 1;
AutoFormatPreview m_aWndPreview;
std::unique_ptr<SwTableAutoFormatTable> m_xTableTable;
diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx
index 514867c..95682aa 100644
--- a/sw/source/uibase/inc/tmpdlg.hxx
+++ b/sw/source/uibase/inc/tmpdlg.hxx
@@ -29,7 +29,7 @@ class SwWrtShell;
class SwTemplateDlgController : public SfxStyleDialogController
{
SfxStyleFamily const nType;
SfxStyleFamily nType;
sal_uInt16 nHtmlMode;
SwWrtShell* pWrtShell;
bool bNewStyle;
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 7017427..629013c 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -60,7 +60,7 @@ public:
class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem
{
void* const pMisc;
void* pMisc;
public:
SwPtrItem( const sal_uInt16 nId, void* pPtr);
@@ -92,7 +92,7 @@ public:
class SwPaMItem : public SfxPoolItem
{
SwPaM* const m_pPaM;
SwPaM* m_pPaM;
public:
SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM);
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index f4e58ad..ec91c89 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -90,7 +90,7 @@ class SwView_Impl
// temporary document for printing text of selection / multi selection
// in PDF export.
SfxObjectShellLock const xTmpSelDocSh;
SfxObjectShellLock xTmpSelDocSh;
SwView* pView;
rtl::Reference<SwScannerEventListener>
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index c386d0c..dba379b 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -165,8 +165,8 @@ class SwXAutoTextEntry final
>
{
SwGlossaries* pGlossaries;
OUString const sGroupName;
OUString const sEntryName;
OUString sGroupName;
OUString sEntryName;
SwDocShellRef xDocSh;
rtl::Reference<SwXBodyText>
mxBodyText;
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index 1421815..316bcf0 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -42,7 +42,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper
class DispatchMutexLock_Impl
{
//::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently
SolarMutexGuard const aGuard;
SolarMutexGuard aGuard;
public:
DispatchMutexLock_Impl();
~DispatchMutexLock_Impl();
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index ef53b76..1bd1956 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -73,7 +73,7 @@ class SwXPrintSettings final : public comphelper::ChainablePropertySet
{
friend class SwXDocumentSettings;
SwXPrintSettingsType const meType;
SwXPrintSettingsType meType;
SwPrintData * mpPrtOpt;
SwDoc *mpDoc;
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index 76a3717..1c6c370 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -47,9 +47,9 @@ class SW_DLLPUBLIC SwOneExampleFrame : public weld::CustomWidgetController
OUString m_sArgumentURL;
SwView* const m_pModuleView;
SwView* m_pModuleView;
sal_uInt32 const m_nStyleFlags;
sal_uInt32 m_nStyleFlags;
bool m_bIsInitialized;
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index cd3d2f0..1636546 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -31,7 +31,7 @@ class SwContentViewConfig : public utl::ConfigItem
{
private:
SwMasterUsrPref& rParent;
bool const bWeb;
bool bWeb;
css::uno::Sequence<OUString> GetPropertyNames() const;
@@ -52,7 +52,7 @@ class SwLayoutViewConfig : public utl::ConfigItem
{
private:
SwMasterUsrPref& rParent;
bool const bWeb;
bool bWeb;
css::uno::Sequence<OUString> GetPropertyNames() const;
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index c661225..4c02e5e 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -497,7 +497,7 @@ private:
struct ModeStack
{
ModeStack *pNext;
bool const bAdd,
bool bAdd,
bBlock,
bExt,
bIns;
@@ -522,9 +522,9 @@ private:
{
Point aDocPos;
std::unique_ptr<CursorStack> pNext;
bool const bValidCurPos : 1;
bool bValidCurPos : 1;
bool bIsFrameSel : 1;
SwTwips const lOffset;
SwTwips lOffset;
CursorStack( bool bValid, bool bFrameSel, const Point &rDocPos,
SwTwips lOff, std::unique_ptr<CursorStack> pN )
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.hxx b/sw/source/uibase/lingu/sdrhhcwrap.hxx
index ea5ff07..133e47c 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.hxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.hxx
@@ -32,12 +32,12 @@ class SdrHHCWrapper : public SdrOutliner
SwView* pView;
SdrTextObj* pTextObj;
std::unique_ptr<OutlinerView> pOutlView;
sal_Int32 const nOptions;
sal_Int32 nOptions;
sal_uInt16 nDocIndex;
LanguageType const nSourceLang;
LanguageType const nTargetLang;
LanguageType nSourceLang;
LanguageType nTargetLang;
const vcl::Font* pTargetFont;
bool const bIsInteractive;
bool bIsInteractive;
public:
SdrHHCWrapper( SwView* pVw,
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 8de6f7dc..336b480 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -273,7 +273,7 @@ namespace {
class SwZoomBox_Impl final : public InterimItemWindow
{
std::unique_ptr<weld::ComboBox> m_xWidget;
sal_uInt16 const nSlotId;
sal_uInt16 nSlotId;
bool bRelease;
DECL_LINK(SelectHdl, weld::ComboBox&, void);
@@ -493,7 +493,7 @@ class SwJumpToSpecificBox_Impl final : public InterimItemWindow
{
std::unique_ptr<weld::Entry> m_xWidget;
sal_uInt16 const nSlotId;
sal_uInt16 nSlotId;
DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
DECL_LINK(SelectHdl, weld::Entry&, bool);
@@ -903,7 +903,7 @@ public:
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
private:
Type const meType;
Type meType;
};
}
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
index abb3fae..ba0f60b 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
@@ -41,7 +41,7 @@ private:
: maURL(rURL)
{}
OUString const maURL;
OUString maURL;
};
void RefreshList();
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index 7f3b81f..7cf8e09 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -62,7 +62,7 @@ class StyleRedefinition
ColorVariable maVariable;
public:
OUString const maElementName;
OUString maElementName;
public:
explicit StyleRedefinition(const OUString& aElementName)
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 42971d3..2e47a54 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -181,7 +181,7 @@ namespace
::osl::Mutex m_aMutex;
Reference< util::XCloseable > m_xDocument;
Timer m_aDeleteTimer;
OUString const m_sTemporaryFile;
OUString m_sTemporaryFile;
sal_Int32 m_nPendingDeleteAttempts;
DelayedFileDeletion(DelayedFileDeletion const&) = delete;
diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx
index 65780a4..19a334c 100644
--- a/test/source/diff/diff.cxx
+++ b/test/source/diff/diff.cxx
@@ -88,8 +88,8 @@ private:
void cppunitAssertEqualDouble(const xmlNodePtr node, const xmlAttrPtr attr, double expected, double found, double delta);
ToleranceContainer toleranceContainer;
xmlDocPtr const xmlFile1;
xmlDocPtr const xmlFile2;
xmlDocPtr xmlFile1;
xmlDocPtr xmlFile2;
std::string fileName;
};
diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx
index b9d6e9e..ce149f1 100644
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@@ -34,7 +34,7 @@ struct CheckFailed {
explicit CheckFailed(OUString const & theMessage): message(theMessage)
{}
OUString const message;
OUString message;
};
template< typename T > void checkEqual(T const & value, T const & argument) {
