include/svtools/ServerDetailsControls.hxx | 2 +-
include/svtools/accessibleruler.hxx | 2 +-
include/svtools/brwbox.hxx | 14 +++++++-------
include/svtools/calendar.hxx | 4 ++--
include/svtools/ctrlbox.hxx | 2 +-
include/svtools/editbrowsebox.hxx | 2 +-
include/svtools/editsyntaxhighlighter.hxx | 5 ++---
include/svtools/ehdl.hxx | 12 ++++++------
include/svtools/embedtransfer.hxx | 2 +-
include/svtools/filechangedchecker.hxx | 4 ++--
include/svtools/filectrl.hxx | 2 +-
include/svtools/fileview.hxx | 2 +-
include/svtools/framestatuslistener.hxx | 2 +-
include/svtools/htmlout.hxx | 2 +-
include/svtools/imap.hxx | 2 +-
include/svtools/ivctrl.hxx | 2 +-
include/svtools/parhtml.hxx | 10 +++++-----
include/svtools/place.hxx | 2 +-
include/svtools/ruler.hxx | 14 +++++++-------
include/svtools/statusbarcontroller.hxx | 2 +-
include/svtools/stringtransfer.hxx | 2 +-
include/svtools/svlbitm.hxx | 2 +-
include/svtools/svtabbx.hxx | 6 +++---
include/svtools/toolboxcontroller.hxx | 2 +-
include/svtools/treelistbox.hxx | 2 +-
include/svtools/unoevent.hxx | 2 +-
include/svtools/valueset.hxx | 2 +-
svtools/inc/FltCallDialogParameter.hxx | 2 +-
svtools/inc/table/tablecontrolinterface.hxx | 4 ++--
svtools/inc/uitest/uiobject.hxx | 2 +-
svtools/inc/vclxaccessibleheaderbaritem.hxx | 2 +-
svtools/source/brwbox/datwin.hxx | 10 +++++-----
svtools/source/config/colorcfg.cxx | 4 ++--
svtools/source/contnr/fileview.cxx | 18 +++++++++---------
svtools/source/contnr/imivctl.hxx | 2 +-
svtools/source/contnr/imivctl1.cxx | 2 +-
svtools/source/contnr/treelistentry.cxx | 2 +-
svtools/source/control/ctrlbox.cxx | 14 +++++++-------
svtools/source/control/ctrltool.cxx | 2 +-
svtools/source/control/headbar.cxx | 4 ++--
svtools/source/control/inettbc.cxx | 10 +++++-----
svtools/source/control/scriptedtext.cxx | 2 +-
svtools/source/control/tabbar.cxx | 4 ++--
svtools/source/control/valueimp.hxx | 4 ++--
svtools/source/dialogs/addresstemplate.cxx | 6 +++---
svtools/source/dialogs/insdlg.cxx | 14 +++++++-------
svtools/source/edit/editsyntaxhighlighter.cxx | 4 ++--
svtools/source/filter/exportdialog.hxx | 26 +++++++++++++-------------
svtools/source/misc/acceleratorexecute.cxx | 2 +-
svtools/source/misc/imagemgr.cxx | 4 ++--
svtools/source/misc/langhelp.cxx | 2 +-
svtools/source/misc/templatefoldercache.cxx | 4 ++--
svtools/source/svhtml/htmlkywd.cxx | 2 +-
svtools/source/table/defaultinputhandler.cxx | 6 +++---
svtools/source/table/tablegeometry.hxx | 4 ++--
svtools/source/uno/unoimap.cxx | 2 +-
56 files changed, 135 insertions(+), 136 deletions(-)
New commits:
commit 07c4aa4298f062cee1894b80ef82e76d5ffcf4c7
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 1 14:30:12 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Oct 3 08:26:03 2018 +0200
loplugin:constfields in svtools
Change-Id: I91553f89d8f5ee42afa52d196bf86f8a92011850
Reviewed-on: https://gerrit.libreoffice.org/61186
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svtools/ServerDetailsControls.hxx
b/include/svtools/ServerDetailsControls.hxx
index 54d930136891..642f9d82e9b4 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -56,7 +56,7 @@ class DetailsContainer
class HostDetailsContainer : public DetailsContainer
{
private:
- sal_uInt16 m_nDefaultPort;
+ sal_uInt16 const m_nDefaultPort;
OUString m_sScheme;
OUString m_sHost;
diff --git a/include/svtools/accessibleruler.hxx
b/include/svtools/accessibleruler.hxx
index 4e45ce995374..d150192c1731 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -180,7 +180,7 @@ private:
tools::Rectangle GetBoundingBox();
/// Name of this object.
- ::rtl::OUString msName;
+ ::rtl::OUString const msName;
/// Reference to the parent object.
css::uno::Reference< css::accessibility::XAccessible >
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index a4aa7a8ac5e0..3311843c658d 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -123,10 +123,10 @@ namespace o3tl
class BrowseEvent
{
VclPtr<vcl::Window> pWin;
- long nRow;
- tools::Rectangle aRect;
- sal_uInt16 nCol;
- sal_uInt16 nColId;
+ long const nRow;
+ tools::Rectangle const aRect;
+ sal_uInt16 const nCol;
+ sal_uInt16 const nColId;
public:
BrowseEvent( vcl::Window* pWindow,
@@ -249,9 +249,9 @@ private:
// fdo#83943, detect if making the cursor position visible is impossible
to achieve
struct CursorMoveAttempt
{
- long m_nCol;
- long m_nRow;
- bool m_bScrolledToReachCell;
+ long const m_nCol;
+ long const m_nRow;
+ bool const m_bScrolledToReachCell;
CursorMoveAttempt(long nCol, long nRow, bool bScrolledToReachCell)
: m_nCol(nCol)
, m_nRow(nRow)
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 7b5ae85a94e9..ea2df0f63be0 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -142,7 +142,7 @@ class SVT_DLLPUBLIC Calendar final : public Control
Date maCurDate;
Date maOldCurDate;
Date maAnchorDate;
- Date maDropDate;
+ Date const maDropDate;
Color maSelColor;
Color maOtherColor;
sal_Int32 mnDayCount;
@@ -291,7 +291,7 @@ private:
VclPtr<Calendar> mpCalendar;
VclPtr<PushButton> mpTodayBtn;
VclPtr<PushButton> mpNoneBtn;
- Date maDefaultDate;
+ Date const maDefaultDate;
bool mbToday;
bool mbNone;
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 355fd44142a6..f6e56bec7728 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -249,7 +249,7 @@ private:
OUString m_sNone;
ScopedVclPtr<VirtualDevice> aVirDev;
Size aTxtSize;
- Color aColor;
+ Color const aColor;
Color maPaintCol;
FieldUnit eSourceUnit;
};
diff --git a/include/svtools/editbrowsebox.hxx
b/include/svtools/editbrowsebox.hxx
index 3a6d897405c0..2b8ce9ee299a 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -233,7 +233,7 @@ namespace svt
class SVT_DLLPUBLIC EditCellController : public CellController
{
IEditImplementation* m_pEditImplementation;
- bool m_bOwnImplementation; // did we create
m_pEditImplementation?
+ bool const m_bOwnImplementation; // did we create
m_pEditImplementation?
public:
EditCellController( Edit* _pEdit );
diff --git a/include/svtools/editsyntaxhighlighter.hxx
b/include/svtools/editsyntaxhighlighter.hxx
index 33666a7ded0f..ee45651b3f86 100644
--- a/include/svtools/editsyntaxhighlighter.hxx
+++ b/include/svtools/editsyntaxhighlighter.hxx
@@ -28,9 +28,8 @@
class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit
{
private:
- bool mbDoBracketHilight;
- SyntaxHighlighter aHighlighter;
- svtools::ColorConfig m_aColorConfig;
+ SyntaxHighlighter const aHighlighter;
+ svtools::ColorConfig const m_aColorConfig;
private:
void DoBracketHilight(sal_uInt16 aKey);
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 2efbb761f4ba..99a2016e091e 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -43,10 +43,10 @@ public:
bool GetString(ErrCode nErrId, OUString &rStr) override;
private:
- sal_uInt16 nCtxId;
+ sal_uInt16 const nCtxId;
const ErrMsgCode* pIds;
- std::locale aResLocale;
- OUString aArg1;
+ std::locale const aResLocale;
+ OUString const aArg1;
};
class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler
@@ -60,10 +60,10 @@ protected:
private:
- ErrCodeArea lStart;
- ErrCodeArea lEnd;
+ ErrCodeArea const lStart;
+ ErrCodeArea const lEnd;
const ErrMsgCode* pIds;
- std::locale aResLocale;
+ std::locale const aResLocale;
SVT_DLLPRIVATE static void GetClassString(ErrCodeClass lErrId, OUString &);
virtual bool CreateString(const ErrorInfo *, OUString &) const
override;
diff --git a/include/svtools/embedtransfer.hxx
b/include/svtools/embedtransfer.hxx
index 6cd0a407093d..7a6fa184b563 100644
--- a/include/svtools/embedtransfer.hxx
+++ b/include/svtools/embedtransfer.hxx
@@ -32,7 +32,7 @@ private:
css::uno::Reference< css::embed::XEmbeddedObject > m_xObj;
std::unique_ptr<Graphic> m_pGraphic;
- sal_Int64 m_nAspect;
+ sal_Int64 const m_nAspect;
OUString maParentShellID;
diff --git a/include/svtools/filechangedchecker.hxx
b/include/svtools/filechangedchecker.hxx
index f9634e18919b..97a3a0617a3c 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -27,9 +27,9 @@ class SVT_DLLPUBLIC FileChangedChecker
{
private:
Idle mIdle;
- OUString mFileName;
+ OUString const mFileName;
TimeValue mLastModTime;
- ::std::function<void ()> mpCallback;
+ ::std::function<void ()> const mpCallback;
bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const;
DECL_LINK(TimerHandler, Timer *, void);
diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index c00d3fccfa81..3e620e2350be 100644
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@ -42,7 +42,7 @@ class SVT_DLLPUBLIC FileControl final : public vcl::Window
{
VclPtr<Edit> maEdit;
VclPtr<PushButton> maButton;
- OUString maButtonText;
+ OUString const maButtonText;
FileControlMode_Internal mnInternalFlags;
SVT_DLLPRIVATE void Resize() override;
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 6feb9d5c4837..9b1645fde80c 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -190,7 +190,7 @@ protected:
struct SvtContentEntry
{
- bool mbIsFolder;
+ bool const mbIsFolder;
OUString maURL;
SvtContentEntry( const OUString& rURL, bool bIsFolder ) :
diff --git a/include/svtools/framestatuslistener.hxx
b/include/svtools/framestatuslistener.hxx
index f2d4d7594285..0fa756b08dc8 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -76,7 +76,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public
css::frame::XStatusListener,
Listener( const css::util::URL& rURL, const css::uno::Reference<
css::frame::XDispatch >& rDispatch ) :
aURL( rURL ), xDispatch( rDispatch ) {}
- css::util::URL aURL;
+ css::util::URL const aURL;
css::uno::Reference< css::frame::XDispatch > xDispatch;
};
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 3adbb23db673..6fbff8903609 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -38,7 +38,7 @@ struct HTMLOutEvent
{
const sal_Char *pBasicName;
const sal_Char *pJavaName;
- SvMacroItemId nEvent;
+ SvMacroItemId const nEvent;
};
struct SVT_DLLPUBLIC HTMLOutContext
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index e0129bffce07..98835c15bb19 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -122,7 +122,7 @@ class IMapCompat
SvStream* pRWStm;
sal_uInt64 nCompatPos;
sal_uInt64 nTotalSize;
- StreamMode nStmMode;
+ StreamMode const nStmMode;
IMapCompat( const IMapCompat& ) = delete;
IMapCompat& operator=( const IMapCompat& ) { return *this; }
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 11ba7f1dee1f..ce1f8c9e7ff7 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -65,7 +65,7 @@ enum class SvxIconChoiceCtrlPositionMode
class SvxIconChoiceCtrlEntry
{
- Image aImage;
+ Image const aImage;
OUString aText;
OUString aQuickHelpText;
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 53c0727fcbf9..b2ece425a87e 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -76,7 +76,7 @@ template<typename EnumT>
struct HTMLOptionEnum
{
const sal_Char *pName; // value of an HTML option
- EnumT nValue; // and corresponding value of an enum
+ EnumT const nValue; // and corresponding value of an enum
};
/** Representation of an HTML option (=attribute in a start tag).
@@ -86,9 +86,9 @@ struct HTMLOptionEnum
*/
class SVT_DLLPUBLIC HTMLOption
{
- OUString aValue; // value of the option (always as string)
- OUString aToken; // name of the option as string
- HtmlOptionId nToken; // and respective token
+ OUString const aValue; // value of the option (always as string)
+ OUString const aToken; // name of the option as string
+ HtmlOptionId const nToken; // and respective token
public:
@@ -148,7 +148,7 @@ class SVT_DLLPUBLIC HTMLParser : public
SvParser<HtmlTokenId>
private:
mutable HTMLOptions maOptions; // options of the start tag
- bool bNewDoc : 1; // read new Doc?
+ bool const bNewDoc : 1; // read new Doc?
bool bIsInHeader : 1; // scan header section
bool bReadListing : 1; // read listings
bool bReadXMP : 1; // read XMP
diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx
index 23dd863350bd..7053c931b892 100644
--- a/include/svtools/place.hxx
+++ b/include/svtools/place.hxx
@@ -18,7 +18,7 @@ private:
OUString msName;
INetURLObject maUrl;
- bool mbEditable;
+ bool const mbEditable;
public:
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index c89550e3f6a2..d3a532db9650 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -576,13 +576,13 @@ struct RulerSelection
struct RulerUnitData
{
- MapUnit eMapUnit; // MAP_UNIT for calculation
- long nTickUnit; // Unit divider
- double nTick1; // Minimal step
- double nTick2; // Tick quarter unit
- double nTick3; // Tick half unit
- double nTick4; // Tick whole unit
- sal_Char aUnitStr[8]; // Unit string
+ MapUnit const eMapUnit; // MAP_UNIT for calculation
+ long const nTickUnit; // Unit divider
+ double const nTick1; // Minimal step
+ double const nTick2; // Tick quarter unit
+ double const nTick3; // Tick half unit
+ double const nTick4; // Tick whole unit
+ sal_Char const aUnitStr[8]; // Unit string
};
diff --git a/include/svtools/statusbarcontroller.hxx
b/include/svtools/statusbarcontroller.hxx
index 1def30e49f8c..d27adb6d6664 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -96,7 +96,7 @@ class SVT_DLLPUBLIC StatusbarController :
Listener( const css::util::URL& rURL, const css::uno::Reference<
css::frame::XDispatch >& rDispatch ) :
aURL( rURL ), xDispatch( rDispatch ) {}
- css::util::URL aURL;
+ css::util::URL const aURL;
css::uno::Reference< css::frame::XDispatch > xDispatch;
};
diff --git a/include/svtools/stringtransfer.hxx
b/include/svtools/stringtransfer.hxx
index fcecc9724ff1..a0b7f500ab43 100644
--- a/include/svtools/stringtransfer.hxx
+++ b/include/svtools/stringtransfer.hxx
@@ -40,7 +40,7 @@ namespace svt
virtual void AddSupportedFormats() override;
virtual bool GetData( const css::datatransfer::DataFlavor& _rFlavor,
const OUString& rDestDoc ) override;
- OUString m_sContent;
+ OUString const m_sContent;
};
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index 3b603f47bbcf..d0125b3a09a6 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -136,7 +136,7 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem
{
bool isVis;
SvLBoxButtonData* pData;
- SvLBoxButtonKind eKind;
+ SvLBoxButtonKind const eKind;
SvItemStateFlags nItemFlags;
static void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType,
vcl::RenderContext const & pRenderContext);
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 3fba520202ec..65277e05f372 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -36,9 +36,9 @@ enum SvTabJustify
struct TabListBoxEventData
{
- SvTreeListEntry* m_pEntry;
- sal_uInt16 m_nColumn;
- OUString m_sOldText;
+ SvTreeListEntry* const m_pEntry;
+ sal_uInt16 const m_nColumn;
+ OUString const m_sOldText;
TabListBoxEventData( SvTreeListEntry* pEntry, sal_uInt16 nColumn, const
OUString& rOldText ) :
m_pEntry( pEntry ), m_nColumn( nColumn ), m_sOldText( rOldText ) {}
diff --git a/include/svtools/toolboxcontroller.hxx
b/include/svtools/toolboxcontroller.hxx
index f66ad50c8dbc..75945673e8b4 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -127,7 +127,7 @@ class SVT_DLLPUBLIC ToolboxController :
Listener( const css::util::URL& rURL, const css::uno::Reference<
css::frame::XDispatch >& rDispatch ) :
aURL( rURL ), xDispatch( rDispatch ) {}
- css::util::URL aURL;
+ css::util::URL const aURL;
css::uno::Reference< css::frame::XDispatch > xDispatch;
};
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index abaf5adb3e75..9f38a6ff76c0 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -770,7 +770,7 @@ public:
class SvInplaceEdit2
{
- Link<SvInplaceEdit2&,void> aCallBackHdl;
+ Link<SvInplaceEdit2&,void> const aCallBackHdl;
Accelerator aAccReturn;
Accelerator aAccEscape;
Idle aIdle;
diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx
index bb2d438fe04f..8fd990e37c67 100644
--- a/include/svtools/unoevent.hxx
+++ b/include/svtools/unoevent.hxx
@@ -40,7 +40,7 @@ enum class SvMacroItemId : sal_uInt16;
*/
struct SvEventDescription
{
- SvMacroItemId mnEvent;
+ SvMacroItemId const mnEvent;
const sal_Char* mpEventName;
};
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 7bd827eca220..fef9fd2f4d71 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -430,7 +430,7 @@ private:
sal_uInt16 mnFirstLine;
sal_uInt16 mnSpacing;
DrawFrameStyle mnFrameStyle;
- Color maColor;
+ Color const maColor;
OUString maText;
WinBits mnStyle;
Link<SvtValueSet*,void> maDoubleClickHdl;
diff --git a/svtools/inc/FltCallDialogParameter.hxx
b/svtools/inc/FltCallDialogParameter.hxx
index d3310a078cbb..29e3fabf5fce 100644
--- a/svtools/inc/FltCallDialogParameter.hxx
+++ b/svtools/inc/FltCallDialogParameter.hxx
@@ -36,7 +36,7 @@ class Window;
struct FltCallDialogParameter
{
VclPtr<vcl::Window> pWindow;
- FieldUnit eFieldUnit;
+ FieldUnit const eFieldUnit;
OUString aFilterExt;
// In and Out PropertySequence for all filter dialogs
diff --git a/svtools/inc/table/tablecontrolinterface.hxx
b/svtools/inc/table/tablecontrolinterface.hxx
index ce066b6d525c..201f0035642a 100644
--- a/svtools/inc/table/tablecontrolinterface.hxx
+++ b/svtools/inc/table/tablecontrolinterface.hxx
@@ -91,8 +91,8 @@ namespace svt { namespace table
struct TableCell
{
- ColPos nColumn;
- RowPos nRow;
+ ColPos const nColumn;
+ RowPos const nRow;
TableCellArea eArea;
TableCell( ColPos const i_column, RowPos const i_row )
diff --git a/svtools/inc/uitest/uiobject.hxx b/svtools/inc/uitest/uiobject.hxx
index d8a525c206ee..ff169749bf1a 100644
--- a/svtools/inc/uitest/uiobject.hxx
+++ b/svtools/inc/uitest/uiobject.hxx
@@ -60,7 +60,7 @@ private:
VclPtr<SvTreeListBox> mxTreeList;
- SvTreeListEntry* mpEntry;
+ SvTreeListEntry* const mpEntry;
};
class SimpleTableUIObject : public TreeListUIObject
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx
b/svtools/inc/vclxaccessibleheaderbaritem.hxx
index 3e6ef4823dab..e4b09ef3a655 100644
--- a/svtools/inc/vclxaccessibleheaderbaritem.hxx
+++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx
@@ -52,7 +52,7 @@ class VCLXAccessibleHeaderBarItem final : public
comphelper::OAccessibleExtended
{
private:
VclPtr<HeaderBar> m_pHeadBar;
- sal_Int32 m_nIndexInParent;
+ sal_Int32 const m_nIndexInParent;
void FillAccessibleStateSet( utl::AccessibleStateSetHelper&
rStateSet );
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index ab8ba930d193..5c30c0955e18 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -34,10 +34,10 @@
class ButtonFrame
{
- tools::Rectangle aRect;
- tools::Rectangle aInnerRect;
- OUString aText;
- bool m_bDrawDisabled;
+ tools::Rectangle const aRect;
+ tools::Rectangle const aInnerRect;
+ OUString const aText;
+ bool const m_bDrawDisabled;
public:
ButtonFrame( const Point& rPt, const Size& rSz,
@@ -57,7 +57,7 @@ public:
class BrowserColumn final
{
- sal_uInt16 _nId;
+ sal_uInt16 const _nId;
sal_uLong _nOriginalWidth;
sal_uLong _nWidth;
OUString _aTitle;
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index 378f046a3714..79c2161ab14d 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -108,8 +108,8 @@ uno::Sequence< OUString> GetPropertyNames(const OUString&
rScheme)
OUString* pNames = aNames.getArray();
struct ColorConfigEntryData_Impl
{
- OUStringLiteral cName;
- bool bCanBeVisible;
+ OUStringLiteral const cName;
+ bool const bCanBeVisible;
};
static const ColorConfigEntryData_Impl cNames[] =
{
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index 188605a84b0d..518775457a99 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -122,7 +122,7 @@ namespace
class CallbackTimer : public ::salhelper::Timer
{
protected:
- SvtFileView_Impl* m_pTimeoutHandler;
+ SvtFileView_Impl* const m_pTimeoutHandler;
public:
explicit CallbackTimer( SvtFileView_Impl* _pHandler ) :
m_pTimeoutHandler( _pHandler ) { }
@@ -171,14 +171,14 @@ private:
SvtFileView_Impl* mpParent;
Timer maResetQuickSearch;
OUString maQuickSearchText;
- OUString msAccessibleDescText;
- OUString msFolder;
- OUString msFile;
+ OUString const msAccessibleDescText;
+ OUString const msFolder;
+ OUString const msFile;
sal_uInt32 mnSearchIndex;
bool mbResizeDisabled : 1;
bool mbAutoResize : 1;
bool mbEnableDelete : 1;
- bool mbShowHeader;
+ bool const mbShowHeader;
void DeleteEntries();
void DoQuickSearch( sal_Unicode rChar );
@@ -218,7 +218,7 @@ class NameTranslationList
protected:
INetURLObject maTransFile; // URL of file with
translation entries
/// for future purposes when dealing with a set of cached
NameTranslationLists
- OUString m_HashedURL;
+ OUString const m_HashedURL;
private:
std::unordered_map<OUString, OUString> m_Translation;
const OUString maTransFileName;
@@ -332,16 +332,16 @@ public:
std::unique_ptr<NameTranslator_Impl> mpNameTrans;
sal_uInt16 mnSortColumn;
bool mbAscending : 1;
- bool mbOnlyFolder : 1;
+ bool const mbOnlyFolder : 1;
bool mbReplaceNames : 1; // translate folder names
or display doc-title instead of file name
sal_Int16 mnSuspendSelectCallback : 1;
bool mbIsFirstResort : 1;
- IntlWrapper aIntlWrapper;
+ IntlWrapper const aIntlWrapper;
OUString maViewURL;
OUString maCurrentFilter;
- Image maFolderImage;
+ Image const maFolderImage;
Link<SvtFileView*,void> maOpenDoneLink;
Reference< XCommandEnvironment > mxCmdEnv;
diff --git a/svtools/source/contnr/imivctl.hxx
b/svtools/source/contnr/imivctl.hxx
index 117ed30b255f..07042df01dcd 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -162,7 +162,7 @@ class SvxIconChoiceCtrl_Impl
Idle aVisRectChangedIdle;
Idle aCallSelectHdlIdle;
Size aVirtOutputSize;
- Size aImageSize;
+ Size const aImageSize;
Size aDefaultTextSize;
Size aOutputSize; // Pixel
VclPtr<SvtIconChoiceCtrl> pView;
diff --git a/svtools/source/contnr/imivctl1.cxx
b/svtools/source/contnr/imivctl1.cxx
index 34626f06494f..1344581737db 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -55,7 +55,7 @@ static bool bEndScrollInvalidate = true;
class IcnViewEdit_Impl : public MultiLineEdit
{
- Link<LinkParamNone*,void> aCallBackHdl;
+ Link<LinkParamNone*,void> const aCallBackHdl;
Accelerator aAccReturn;
Accelerator aAccEscape;
Idle maLoseFocusIdle;
diff --git a/svtools/source/contnr/treelistentry.cxx
b/svtools/source/contnr/treelistentry.cxx
index 708aaae1d116..35c342f4a80f 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -151,7 +151,7 @@ namespace {
class FindByType
{
- SvLBoxItemType meType;
+ SvLBoxItemType const meType;
public:
explicit FindByType(SvLBoxItemType eType) : meType(eType) {}
bool operator() (const std::unique_ptr<SvLBoxItem>& rpItem) const
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index a6dfa356f150..38a42a46567d 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -198,14 +198,14 @@ long BorderWidthImpl::GuessWidth( long nLine1, long
nLine2, long nGap )
class ImpLineListData
{
private:
- BorderWidthImpl m_aWidthImpl;
+ BorderWidthImpl const m_aWidthImpl;
- Color ( *m_pColor1Fn )( Color );
- Color ( *m_pColor2Fn )( Color );
- Color ( *m_pColorDistFn )( Color, Color );
+ Color ( * const m_pColor1Fn )( Color );
+ Color ( * const m_pColor2Fn )( Color );
+ Color ( * const m_pColorDistFn )( Color, Color );
- long m_nMinWidth;
- SvxBorderLineStyle m_nStyle;
+ long const m_nMinWidth;
+ SvxBorderLineStyle const m_nStyle;
public:
ImpLineListData( BorderWidthImpl aWidthImpl, SvxBorderLineStyle nStyle,
@@ -358,7 +358,7 @@ namespace {
class ApplyScale
{
- double mfScale;
+ double const mfScale;
public:
explicit ApplyScale( double fScale ) : mfScale(fScale) {}
void operator() ( double& rVal )
diff --git a/svtools/source/control/ctrltool.cxx
b/svtools/source/control/ctrltool.cxx
index 708f4ef8aa14..70a6ade68c71 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -105,7 +105,7 @@ class ImplFontListNameInfo
friend class FontList;
private:
- OUString maSearchName;
+ OUString const maSearchName;
ImplFontListFontMetric* mpFirst;
FontListFontNameType mnType;
diff --git a/svtools/source/control/headbar.cxx
b/svtools/source/control/headbar.cxx
index 5c1f32d1cd95..352e79e13e87 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -35,8 +35,8 @@ public:
sal_uInt16 mnId;
HeaderBarItemBits mnBits;
long mnSize;
- OString maHelpId;
- Image maImage;
+ OString const maHelpId;
+ Image const maImage;
OUString maOutText;
OUString maText;
OUString maHelpText;
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index cb6586600939..5ac408552ba6 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -96,11 +96,11 @@ class SvtMatchContext_Impl: public salhelper::Thread
std::vector<OUString> aCompletions;
std::vector<OUString> aURLs;
svtools::AsynchronLink aLink;
- OUString aBaseURL;
- OUString aText;
+ OUString const aBaseURL;
+ OUString const aText;
VclPtr<SvtURLBox> pBox;
- bool bOnlyDirectories;
- bool bNoSelection;
+ bool const bOnlyDirectories;
+ bool const bNoSelection;
osl::Mutex mutex_;
bool stopped_;
@@ -129,7 +129,7 @@ class MatchContext_Impl: public salhelper::Thread
std::vector<OUString> aCompletions;
std::vector<OUString> aURLs;
svtools::AsynchronLink aLink;
- OUString aText;
+ OUString const aText;
URLBox* pBox;
osl::Mutex mutex_;
diff --git a/svtools/source/control/scriptedtext.cxx
b/svtools/source/control/scriptedtext.cxx
index 16b90aedd764..400e10b10f9d 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -38,7 +38,7 @@ private:
vcl::Font maLatinFont; /// The font for latin
text portions.
vcl::Font maAsianFont; /// The font for asian
text portions.
vcl::Font maCmplxFont; /// The font for complex
text portions.
- vcl::Font maDefltFont; /// The default font of
the output device.
+ vcl::Font const maDefltFont; /// The default font of
the output device.
OUString maText; /// The text.
vector< sal_Int32 > maPosVec; /// The start position of
each text portion.
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index 0d617312658d..cebb1172587a 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -198,14 +198,14 @@ public:
struct ImplTabBarItem
{
- sal_uInt16 mnId;
+ sal_uInt16 const mnId;
TabBarPageBits mnBits;
OUString maText;
OUString maHelpText;
OUString maAuxiliaryText; // used in LayerTabBar for real layer name
tools::Rectangle maRect;
long mnWidth;
- OString maHelpId;
+ OString const maHelpId;
bool mbShort : 1;
bool mbSelect : 1;
bool mbProtect : 1;
diff --git a/svtools/source/control/valueimp.hxx
b/svtools/source/control/valueimp.hxx
index ee685d283afd..2fdd85590623 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -337,7 +337,7 @@ private:
css::accessibility::XAccessibleEventListener > >
mxEventListeners;
::osl::Mutex
maMutex;
ValueSetItem*
mpParent;
- bool
mbIsTransientChildrenDisabled;
+ bool const
mbIsTransientChildrenDisabled;
static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
@@ -400,7 +400,7 @@ private:
css::accessibility::XAccessibleEventListener > >
mxEventListeners;
::osl::Mutex
maMutex;
SvtValueSetItem*
mpParent;
- bool
mbIsTransientChildrenDisabled;
+ bool const
mbIsTransientChildrenDisabled;
static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
diff --git a/svtools/source/dialogs/addresstemplate.cxx
b/svtools/source/dialogs/addresstemplate.cxx
index 23479c9f9eb5..292b7b3a23fa 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -122,8 +122,8 @@ namespace svt
class AssigmentTransientData : public IAssigmentData
{
protected:
- OUString m_sDSName;
- OUString m_sTableName;
+ OUString const m_sDSName;
+ OUString const m_sTableName;
MapString2String m_aAliases;
public:
@@ -431,7 +431,7 @@ void AssignmentPersistentData::ImplCommit()
/// indicates that we've an odd field number. This member is for
efficiency only, it's redundant.
bool bOddFieldNumber : 1;
/// indicates that we're working with the real persistent configuration
- bool bWorkingPersistent : 1;
+ bool const bWorkingPersistent : 1;
/// the strings to use as labels for the field selection listboxes
std::vector<OUString> aFieldLabels;
diff --git a/svtools/source/dialogs/insdlg.cxx
b/svtools/source/dialogs/insdlg.cxx
index 1ccd6114c416..bb0ea1f07393 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -43,12 +43,12 @@ using namespace ::com::sun::star;
struct OleObjectDescriptor
{
- sal_uInt32 cbSize;
- ClsId clsid;
- sal_uInt32 dwDrawAspect;
- Size sizel;
- Point pointl;
- sal_uInt32 dwStatus;
+ sal_uInt32 const cbSize;
+ ClsId const clsid;
+ sal_uInt32 const dwDrawAspect;
+ Size const sizel;
+ Point const pointl;
+ sal_uInt32 const dwStatus;
sal_uInt32 dwFullUserTypeName;
sal_uInt32 dwSrcOfCopy;
};
@@ -190,7 +190,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName(
SotClipboardFormatId nId )
{
struct SotResourcePair
{
- SotClipboardFormatId mnSotId;
+ SotClipboardFormatId const mnSotId;
const char* mpResId;
};
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx
b/svtools/source/edit/editsyntaxhighlighter.cxx
index 99c1fde4c4ea..22b64c740772 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -26,7 +26,7 @@
MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( vcl::Window*
pParent, WinBits nWinStyle,
- HighlighterLanguage aLanguage): MultiLineEdit(pParent,nWinStyle),
mbDoBracketHilight(true), aHighlighter(aLanguage)
+ HighlighterLanguage aLanguage): MultiLineEdit(pParent,nWinStyle),
aHighlighter(aLanguage)
{
EnableUpdateData(300);
}
@@ -109,7 +109,7 @@ void
MultiLineEditSyntaxHighlight::DoBracketHilight(sal_uInt16 nKey)
bool MultiLineEditSyntaxHighlight::PreNotify( NotifyEvent& rNEvt )
{
- if ( mbDoBracketHilight && (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
)
+ if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
DoBracketHilight(rNEvt.GetKeyEvent()->GetCharCode());
return MultiLineEdit::PreNotify(rNEvt);
diff --git a/svtools/source/filter/exportdialog.hxx
b/svtools/source/filter/exportdialog.hxx
index 7d66df5a2c29..99a07021355e 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -99,17 +99,17 @@ private:
VclPtr<OKButton> mpBtnOK;
- OUString msEstimatedSizePix1;
- OUString msEstimatedSizePix2;
- OUString msEstimatedSizeVec;
-
- OUString ms1BitTreshold;
- OUString ms1BitDithered;
- OUString ms4BitGrayscale;
- OUString ms4BitColorPalette;
- OUString ms8BitGrayscale;
- OUString ms8BitColorPalette;
- OUString ms24BitColor;
+ OUString const msEstimatedSizePix1;
+ OUString const msEstimatedSizePix2;
+ OUString const msEstimatedSizeVec;
+
+ OUString const ms1BitTreshold;
+ OUString const ms1BitDithered;
+ OUString const ms4BitGrayscale;
+ OUString const ms4BitColorPalette;
+ OUString const ms8BitGrayscale;
+ OUString const ms8BitColorPalette;
+ OUString const ms24BitColor;
std::unique_ptr<FilterConfigItem> mpOptionsItem;
std::unique_ptr<FilterConfigItem> mpFilterOptionsItem;
@@ -124,8 +124,8 @@ private:
css::awt::Size maOriginalSize; // the original graphic size in
1/100mm
css::awt::Size maSize; // for vector graphics it always
contains the logical size in 1/100mm
- bool mbIsPixelFormat;
- bool mbExportSelection;
+ bool const mbIsPixelFormat;
+ bool const mbExportSelection;
bool mbGraphicsSource; // whether source document is
graphics (Draw, Impress) or not (Calc, Writer)
sal_Int32 mnInitialResolutionUnit;
diff --git a/svtools/source/misc/acceleratorexecute.cxx
b/svtools/source/misc/acceleratorexecute.cxx
index 6d4737334dce..60e831a5b2cb 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -46,7 +46,7 @@ class AsyncAccelExec : public
cppu::WeakImplHelper<css::lang::XEventListener>
private:
css::uno::Reference<css::lang::XComponent> m_xFrame;
css::uno::Reference< css::frame::XDispatch > m_xDispatch;
- css::util::URL m_aURL;
+ css::util::URL const m_aURL;
vcl::EventPoster m_aAsyncCallback;
public:
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index f7a9a9e8a703..9456af23c7b4 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -51,9 +51,9 @@
struct SvtExtensionResIdMapping_Impl
{
const char* _pExt;
- bool _bExt;
+ bool const _bExt;
const char* pStrId;
- SvImageId _nImgId;
+ SvImageId const _nImgId;
};
static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index c51e9e7f9e4f..51d8926915fa 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -68,7 +68,7 @@ static std::unique_ptr<Idle> xLangpackInstaller;
class InstallLangpack : public Idle
{
- std::vector<OUString> m_aPackages;
+ std::vector<OUString> const m_aPackages;
public:
explicit InstallLangpack(const std::vector<OUString>& rPackages)
: Idle("install langpack")
diff --git a/svtools/source/misc/templatefoldercache.cxx
b/svtools/source/misc/templatefoldercache.cxx
index 28b547b329c2..355fbd4695c3 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -106,7 +106,7 @@ namespace svt
public:
private:
- INetURLObject m_aURL;
+ INetURLObject const m_aURL;
util::DateTime m_aLastModified; // date of last
modification as reported by UCP
TemplateFolderContent m_aSubContents; // sorted (by name) list
of the children
@@ -383,7 +383,7 @@ namespace svt
bool m_bNeedsUpdate : 1;
bool m_bKnowState : 1;
bool m_bValidCurrentState : 1;
- bool m_bAutoStoreState : 1;
+ bool const m_bAutoStoreState : 1;
public:
explicit TemplateFolderCacheImpl( bool _bAutoStoreState );
diff --git a/svtools/source/svhtml/htmlkywd.cxx
b/svtools/source/svhtml/htmlkywd.cxx
index 8a633c49404c..ae592f241380 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -560,7 +560,7 @@ struct HTML_OptionEntry
const sal_Char *sToken;
const OUString *pUToken;
};
- HtmlOptionId nToken;
+ HtmlOptionId const nToken;
};
static HTML_OptionEntry aHTMLOptionTab[] = {
diff --git a/svtools/source/table/defaultinputhandler.cxx
b/svtools/source/table/defaultinputhandler.cxx
index 7f01f84f3bd6..44109cb93ec8 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -142,9 +142,9 @@ namespace svt { namespace table
struct ActionMapEntry
{
- sal_uInt16 nKeyCode;
- sal_uInt16 nKeyModifier;
- TableControlAction eAction;
+ sal_uInt16 const nKeyCode;
+ sal_uInt16 const nKeyModifier;
+ TableControlAction const eAction;
}
static const aKnownActions[] = {
{ KEY_DOWN, 0, cursorDown },
diff --git a/svtools/source/table/tablegeometry.hxx
b/svtools/source/table/tablegeometry.hxx
index 8ba81c03d644..19939fe67c6a 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -85,7 +85,7 @@ namespace svt { namespace table
bool impl_isValidRow( RowPos const i_row ) const;
RowPos m_nRowPos;
- bool m_bAllowVirtualRows;
+ bool const m_bAllowVirtualRows;
};
@@ -120,7 +120,7 @@ namespace svt { namespace table
class TableCellGeometry
{
private:
- TableRowGeometry m_aRow;
+ TableRowGeometry const m_aRow;
TableColumnGeometry m_aCol;
public:
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 2999b5aff1a3..e863a2ed5389 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -108,7 +108,7 @@ private:
static rtl::Reference<PropertySetInfo> createPropertySetInfo( sal_uInt16
nType );
- sal_uInt16 mnType;
+ sal_uInt16 const mnType;
OUString maURL;
OUString maAltText;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
