summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-13 16:49:06 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-13 19:20:38 +0100
commitd077cd6189da55cab0bdea3a265446f362160ae0 (patch)
treecf6bc114247d2ffae7294582611d3c1ae5654bec /svtools
parent17e712ccc8fa93d57672916e3c8adaa8febc9f8c (diff)
Revert "loplugin:constfields in svtools"
This reverts commit 07c4aa4298f062cee1894b80ef82e76d5ffcf4c7. Change-Id: Ic3f639581b9aca373f82c011f15be60d117b1943 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90476 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/FltCallDialogParameter.hxx2
-rw-r--r--svtools/inc/table/tablecontrolinterface.hxx4
-rw-r--r--svtools/source/brwbox/datwin.hxx10
-rw-r--r--svtools/source/control/accessibleruler.hxx2
-rw-r--r--svtools/source/control/ctrlbox.cxx2
-rw-r--r--svtools/source/control/ctrltool.cxx4
-rw-r--r--svtools/source/control/inettbc.cxx6
-rw-r--r--svtools/source/control/scriptedtext.cxx2
-rw-r--r--svtools/source/control/tabbar.cxx4
-rw-r--r--svtools/source/control/valueimp.hxx4
-rw-r--r--svtools/source/dialogs/ServerDetailsControls.hxx2
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx6
-rw-r--r--svtools/source/dialogs/insdlg.cxx14
-rw-r--r--svtools/source/filter/exportdialog.hxx26
-rw-r--r--svtools/source/misc/acceleratorexecute.cxx2
-rw-r--r--svtools/source/misc/imagemgr.cxx4
-rw-r--r--svtools/source/misc/langhelp.cxx2
-rw-r--r--svtools/source/misc/templatefoldercache.cxx4
-rw-r--r--svtools/source/table/defaultinputhandler.cxx6
-rw-r--r--svtools/source/table/tablegeometry.hxx4
-rw-r--r--svtools/source/uno/unoimap.cxx2
21 files changed, 56 insertions, 56 deletions
diff --git a/svtools/inc/FltCallDialogParameter.hxx b/svtools/inc/FltCallDialogParameter.hxx
index c30744875ec8..0a45e65d7448 100644
--- a/svtools/inc/FltCallDialogParameter.hxx
+++ b/svtools/inc/FltCallDialogParameter.hxx
@@ -34,7 +34,7 @@ class Window;
struct FltCallDialogParameter
{
weld::Window* pWindow;
- FieldUnit const eFieldUnit;
+ FieldUnit 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 bb8e8a701b96..e78a6845ceea 100644
--- a/svtools/inc/table/tablecontrolinterface.hxx
+++ b/svtools/inc/table/tablecontrolinterface.hxx
@@ -87,8 +87,8 @@ namespace svt { namespace table
struct TableCell
{
- ColPos const nColumn;
- RowPos const nRow;
+ ColPos nColumn;
+ RowPos nRow;
TableCellArea eArea;
TableCell( ColPos const i_column, RowPos const i_row )
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index d0fa8ff31db1..1105708cc5a5 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -30,10 +30,10 @@
class ButtonFrame
{
- tools::Rectangle const aRect;
- tools::Rectangle const aInnerRect;
- OUString const aText;
- bool const m_bDrawDisabled;
+ tools::Rectangle aRect;
+ tools::Rectangle aInnerRect;
+ OUString aText;
+ bool m_bDrawDisabled;
public:
ButtonFrame( const Point& rPt, const Size& rSz,
@@ -53,7 +53,7 @@ public:
class BrowserColumn final
{
- sal_uInt16 const _nId;
+ sal_uInt16 _nId;
sal_uLong _nOriginalWidth;
sal_uLong _nWidth;
OUString _aTitle;
diff --git a/svtools/source/control/accessibleruler.hxx b/svtools/source/control/accessibleruler.hxx
index c26cf96fa239..bd7d46123d2b 100644
--- a/svtools/source/control/accessibleruler.hxx
+++ b/svtools/source/control/accessibleruler.hxx
@@ -165,7 +165,7 @@ private:
tools::Rectangle GetBoundingBox();
/// Name of this object.
- OUString const msName;
+ OUString msName;
/// Reference to the parent object.
css::uno::Reference< css::accessibility::XAccessible >
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 4ad49c2fc976..d81dda3b8b17 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -279,7 +279,7 @@ namespace {
class ApplyScale
{
- double const mfScale;
+ double 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 fbf046328a9b..cdd1aed8a6db 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -109,8 +109,8 @@ class ImplFontListNameInfo
friend class FontList;
private:
- OUString const maSearchName;
- ImplFontListFontMetric* mpFirst;
+ OUString maSearchName;
+ ImplFontListFontMetric* mpFirst;
FontListFontNameType mnType;
explicit ImplFontListNameInfo(const OUString& rSearchName)
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 5a7fc9c0c850..9fcb473cc81f 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -90,10 +90,10 @@ class SvtMatchContext_Impl: public salhelper::Thread
std::vector<OUString> aCompletions;
std::vector<OUString> aURLs;
svtools::AsynchronLink aLink;
- OUString const aText;
+ OUString aText;
SvtURLBox* pBox;
- bool const bOnlyDirectories;
- bool const bNoSelection;
+ bool bOnlyDirectories;
+ bool bNoSelection;
osl::Mutex mutex_;
bool stopped_;
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 0b92e9081219..4c7155dea8dc 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -39,7 +39,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 const maDefltFont; /// The default font of the output device.
+ vcl::Font 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 cce013c60993..5164e1937268 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -190,14 +190,14 @@ public:
struct ImplTabBarItem
{
- sal_uInt16 const mnId;
+ sal_uInt16 mnId;
TabBarPageBits mnBits;
OUString maText;
OUString maHelpText;
OUString maAuxiliaryText; // used in LayerTabBar for real layer name
tools::Rectangle maRect;
long mnWidth;
- OString const maHelpId;
+ OString 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 39d0a86b568b..4584a27faaed 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -335,7 +335,7 @@ private:
css::accessibility::XAccessibleEventListener > > mxEventListeners;
::osl::Mutex maMutex;
ValueSetItem* mpParent;
- bool const mbIsTransientChildrenDisabled;
+ bool mbIsTransientChildrenDisabled;
public:
@@ -395,7 +395,7 @@ private:
css::accessibility::XAccessibleEventListener > > mxEventListeners;
::osl::Mutex maMutex;
SvtValueSetItem* mpParent;
- bool const mbIsTransientChildrenDisabled;
+ bool mbIsTransientChildrenDisabled;
public:
diff --git a/svtools/source/dialogs/ServerDetailsControls.hxx b/svtools/source/dialogs/ServerDetailsControls.hxx
index 3bc5fccc530a..d5041ddefff5 100644
--- a/svtools/source/dialogs/ServerDetailsControls.hxx
+++ b/svtools/source/dialogs/ServerDetailsControls.hxx
@@ -65,7 +65,7 @@ class DetailsContainer
class HostDetailsContainer : public DetailsContainer
{
private:
- sal_uInt16 const m_nDefaultPort;
+ sal_uInt16 m_nDefaultPort;
OUString m_sScheme;
OUString m_sHost;
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 9550e7bc232b..48e10090d2dc 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -123,8 +123,8 @@ namespace svt
class AssigmentTransientData : public IAssigmentData
{
protected:
- OUString const m_sDSName;
- OUString const m_sTableName;
+ OUString m_sDSName;
+ OUString m_sTableName;
MapString2String m_aAliases;
public:
@@ -426,7 +426,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 const bWorkingPersistent : 1;
+ bool 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 5b387d275626..9696a958f18d 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -43,12 +43,12 @@ namespace {
struct OleObjectDescriptor
{
- sal_uInt32 const cbSize;
- ClsId const clsid;
- sal_uInt32 const dwDrawAspect;
- Size const sizel;
- Point const pointl;
- sal_uInt32 const dwStatus;
+ sal_uInt32 cbSize;
+ ClsId clsid;
+ sal_uInt32 dwDrawAspect;
+ Size sizel;
+ Point pointl;
+ sal_uInt32 dwStatus;
sal_uInt32 dwFullUserTypeName;
sal_uInt32 dwSrcOfCopy;
};
@@ -182,7 +182,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId )
{
struct SotResourcePair
{
- SotClipboardFormatId const mnSotId;
+ SotClipboardFormatId mnSotId;
const char* mpResId;
};
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index 318c0bfa251e..137279ee6464 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -51,17 +51,17 @@ private:
const css::uno::Reference< css::graphic::XGraphic >&
mxGraphic;
- OUString const msEstimatedSizePix1;
- OUString const msEstimatedSizePix2;
- OUString const msEstimatedSizeVec;
-
- OUString const ms1BitThreshold;
- OUString const ms1BitDithered;
- OUString const ms4BitGrayscale;
- OUString const ms4BitColorPalette;
- OUString const ms8BitGrayscale;
- OUString const ms8BitColorPalette;
- OUString const ms24BitColor;
+ OUString msEstimatedSizePix1;
+ OUString msEstimatedSizePix2;
+ OUString msEstimatedSizeVec;
+
+ OUString ms1BitThreshold;
+ OUString ms1BitDithered;
+ OUString ms4BitGrayscale;
+ OUString ms4BitColorPalette;
+ OUString ms8BitGrayscale;
+ OUString ms8BitColorPalette;
+ OUString ms24BitColor;
std::unique_ptr<FilterConfigItem> mpOptionsItem;
std::unique_ptr<FilterConfigItem> mpFilterOptionsItem;
@@ -75,8 +75,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 const mbIsPixelFormat;
- bool const mbExportSelection;
+ bool mbIsPixelFormat;
+ bool 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 b1ed64352fbf..0a36c491f556 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -49,7 +49,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 const m_aURL;
+ css::util::URL m_aURL;
vcl::EventPoster m_aAsyncCallback;
public:
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 1e089ff59fc7..3f458647564c 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -48,9 +48,9 @@ namespace {
struct SvtExtensionResIdMapping_Impl
{
const char* _pExt;
- bool const _bExt;
+ bool _bExt;
const char* pStrId;
- SvImageId const _nImgId;
+ SvImageId _nImgId;
};
}
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index dd681dc42952..e64a3b869076 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -68,7 +68,7 @@ namespace {
class InstallLangpack : public Idle
{
- std::vector<OUString> const m_aPackages;
+ std::vector<OUString> 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 fc6f38a7985e..8a0c338be63b 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -113,7 +113,7 @@ namespace svt
public:
private:
- INetURLObject const m_aURL;
+ INetURLObject m_aURL;
util::DateTime m_aLastModified; // date of last modification as reported by UCP
TemplateFolderContent m_aSubContents; // sorted (by name) list of the children
@@ -393,7 +393,7 @@ namespace svt
bool m_bNeedsUpdate : 1;
bool m_bKnowState : 1;
bool m_bValidCurrentState : 1;
- bool const m_bAutoStoreState : 1;
+ bool m_bAutoStoreState : 1;
public:
explicit TemplateFolderCacheImpl( bool _bAutoStoreState );
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index 099c8cc50c23..6b84fbf318cf 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -141,9 +141,9 @@ namespace svt::table
struct ActionMapEntry
{
- sal_uInt16 const nKeyCode;
- sal_uInt16 const nKeyModifier;
- TableControlAction const eAction;
+ sal_uInt16 nKeyCode;
+ sal_uInt16 nKeyModifier;
+ TableControlAction eAction;
}
static const aKnownActions[] = {
{ KEY_DOWN, 0, cursorDown },
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index a206c5063690..09374d8b112d 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -84,7 +84,7 @@ namespace svt { namespace table
bool impl_isValidRow( RowPos const i_row ) const;
RowPos m_nRowPos;
- bool const m_bAllowVirtualRows;
+ bool m_bAllowVirtualRows;
};
@@ -119,7 +119,7 @@ namespace svt { namespace table
class TableCellGeometry
{
private:
- TableRowGeometry const m_aRow;
+ TableRowGeometry m_aRow;
TableColumnGeometry m_aCol;
public:
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index ef14c9487575..df35376832d9 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 const mnType;
+ sal_uInt16 mnType;
OUString maURL;
OUString maAltText;