Revert "loplugin:constfields in svtools"

This reverts commit 07c4aa4298.

Change-Id: Ic3f639581b9aca373f82c011f15be60d117b1943
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90476
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-03-13 19:20:38 +01:00
parent 17e712ccc8
commit d077cd6189
46 changed files with 109 additions and 109 deletions
@@ -47,7 +47,7 @@ class VCLXAccessibleHeaderBarItem final : public comphelper::OAccessibleExtended
{
private:
VclPtr<HeaderBar> m_pHeadBar;
sal_Int32 const m_nIndexInParent;
sal_Int32 m_nIndexInParent;
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+1 -1
View File
@@ -175,7 +175,7 @@ public:
struct SvtContentEntry
{
bool const mbIsFolder;
bool mbIsFolder;
OUString maURL;
SvtContentEntry( const OUString& rURL, bool bIsFolder ) :
+7 -7
View File
@@ -120,10 +120,10 @@ namespace o3tl
class BrowseEvent
{
VclPtr<vcl::Window> pWin;
long const nRow;
tools::Rectangle const aRect;
sal_uInt16 const nCol;
sal_uInt16 const nColId;
long nRow;
tools::Rectangle aRect;
sal_uInt16 nCol;
sal_uInt16 nColId;
public:
BrowseEvent( vcl::Window* pWindow,
@@ -244,9 +244,9 @@ private:
// fdo#83943, detect if making the cursor position visible is impossible to achieve
struct CursorMoveAttempt
{
long const m_nCol;
long const m_nRow;
bool const m_bScrolledToReachCell;
long m_nCol;
long m_nRow;
bool m_bScrolledToReachCell;
CursorMoveAttempt(long nCol, long nRow, bool bScrolledToReachCell)
: m_nCol(nCol)
, m_nRow(nRow)
+5 -5
View File
@@ -44,12 +44,12 @@ class ImpLineListData
private:
BorderWidthImpl const m_aWidthImpl;
Color ( * const m_pColor1Fn )( Color );
Color ( * const m_pColor2Fn )( Color );
Color ( * const m_pColorDistFn )( Color, Color );
Color ( * m_pColor1Fn )( Color );
Color ( * m_pColor2Fn )( Color );
Color ( * m_pColorDistFn )( Color, Color );
long const m_nMinWidth;
SvxBorderLineStyle const m_nStyle;
long m_nMinWidth;
SvxBorderLineStyle m_nStyle;
public:
ImpLineListData( BorderWidthImpl aWidthImpl,
+1 -1
View File
@@ -229,7 +229,7 @@ namespace svt
class SVT_DLLPUBLIC EditCellController : public CellController
{
IEditImplementation* m_pEditImplementation;
bool const m_bOwnImplementation; // did we create m_pEditImplementation?
bool m_bOwnImplementation; // did we create m_pEditImplementation?
public:
EditCellController( Edit* _pEdit );
+2 -2
View File
@@ -28,8 +28,8 @@
class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public VclMultiLineEdit
{
private:
SyntaxHighlighter const aHighlighter;
svtools::ColorConfig const m_aColorConfig;
SyntaxHighlighter aHighlighter;
svtools::ColorConfig m_aColorConfig;
private:
void DoBracketHilight(sal_uInt16 aKey);
+6 -6
View File
@@ -42,10 +42,10 @@ public:
bool GetString(ErrCode nErrId, OUString &rStr) override;
private:
sal_uInt16 const nCtxId;
sal_uInt16 nCtxId;
const ErrMsgCode* pIds;
std::locale const aResLocale;
OUString const aArg1;
std::locale aResLocale;
OUString aArg1;
};
class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler
@@ -59,10 +59,10 @@ protected:
private:
ErrCodeArea const lStart;
ErrCodeArea const lEnd;
ErrCodeArea lStart;
ErrCodeArea lEnd;
const ErrMsgCode* pIds;
std::locale const aResLocale;
std::locale aResLocale;
SVT_DLLPRIVATE static void GetClassString(ErrCodeClass lErrId, OUString &);
virtual bool CreateString(const ErrorInfo *, OUString &) const override;
+1 -1
View File
@@ -33,7 +33,7 @@ private:
css::uno::Reference< css::embed::XEmbeddedObject > m_xObj;
std::unique_ptr<Graphic> m_pGraphic;
sal_Int64 const m_nAspect;
sal_Int64 m_nAspect;
OUString maParentShellID;
+2 -2
View File
@@ -29,9 +29,9 @@ class SVT_DLLPUBLIC FileChangedChecker
{
private:
Idle mIdle;
OUString const mFileName;
OUString mFileName;
TimeValue mLastModTime;
::std::function<void ()> const mpCallback;
::std::function<void ()> mpCallback;
bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const;
DECL_LINK(TimerHandler, Timer *, void);
+1 -1
View File
@@ -75,7 +75,7 @@ class 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 const aURL;
css::util::URL aURL;
css::uno::Reference< css::frame::XDispatch > xDispatch;
};
+1 -1
View File
@@ -36,7 +36,7 @@ struct HTMLOutEvent
{
const char *pBasicName;
const char *pJavaName;
SvMacroItemId const nEvent;
SvMacroItemId nEvent;
};
struct SVT_DLLPUBLIC HTMLOutContext
+6 -6
View File
@@ -75,8 +75,8 @@ enum class HTMLScriptLanguage
template<typename EnumT>
struct HTMLOptionEnum
{
const char *pName; // value of an HTML option
EnumT const nValue; // and corresponding value of an enum
const char *pName; // value of an HTML option
EnumT 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 const aValue; // value of the option (always as string)
OUString const aToken; // name of the option as string
HtmlOptionId const nToken; // and respective token
OUString aValue; // value of the option (always as string)
OUString aToken; // name of the option as string
HtmlOptionId 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 const bNewDoc : 1; // read new Doc?
bool bNewDoc : 1; // read new Doc?
bool bIsInHeader : 1; // scan header section
bool bReadListing : 1; // read listings
bool bReadXMP : 1; // read XMP
+1 -1
View File
@@ -18,7 +18,7 @@ private:
OUString msName;
INetURLObject maUrl;
bool const mbEditable;
bool mbEditable;
public:
+7 -7
View File
@@ -572,13 +572,13 @@ struct RulerSelection
struct RulerUnitData
{
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
char const aUnitStr[8]; // Unit string
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
char aUnitStr[8]; // Unit string
};
+1 -1
View File
@@ -99,7 +99,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 const aURL;
css::util::URL aURL;
css::uno::Reference< css::frame::XDispatch > xDispatch;
};
+1 -1
View File
@@ -40,7 +40,7 @@ namespace svt
virtual void AddSupportedFormats() override;
virtual bool GetData( const css::datatransfer::DataFlavor& _rFlavor, const OUString& rDestDoc ) override;
OUString const m_sContent;
OUString m_sContent;
};
+1 -1
View File
@@ -135,7 +135,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 const aURL;
css::util::URL aURL;
css::uno::Reference< css::frame::XDispatch > xDispatch;
};
+1 -1
View File
@@ -41,7 +41,7 @@ enum class SvMacroItemId : sal_uInt16;
*/
struct SvEventDescription
{
SvMacroItemId const mnEvent;
SvMacroItemId mnEvent;
const char* mpEventName;
};
+1 -1
View File
@@ -122,7 +122,7 @@ class IMapCompat
SvStream* pRWStm;
sal_uInt64 nCompatPos;
sal_uInt64 nTotalSize;
StreamMode const nStmMode;
StreamMode nStmMode;
IMapCompat( const IMapCompat& ) = delete;
IMapCompat& operator=( const IMapCompat& ) { return *this; }
+1 -1
View File
@@ -58,7 +58,7 @@ enum class SvxIconChoiceCtrlPositionMode
class SvxIconChoiceCtrlEntry
{
Image const aImage;
Image aImage;
OUString aText;
OUString aQuickHelpText;
+1 -1
View File
@@ -734,7 +734,7 @@ public:
class SvInplaceEdit2
{
Link<SvInplaceEdit2&,void> const aCallBackHdl;
Link<SvInplaceEdit2&,void> aCallBackHdl;
Accelerator aAccReturn;
Accelerator aAccEscape;
Idle aIdle;
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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 )
+5 -5
View File
@@ -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;
+1 -1
View File
@@ -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 >
+1 -1
View File
@@ -279,7 +279,7 @@ namespace {
class ApplyScale
{
double const mfScale;
double mfScale;
public:
explicit ApplyScale( double fScale ) : mfScale(fScale) {}
void operator() ( double& rVal )
+2 -2
View File
@@ -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)
+3 -3
View File
@@ -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_;
+1 -1
View File
@@ -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.
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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:
@@ -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;
+3 -3
View File
@@ -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;
+7 -7
View File
@@ -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;
};
+12 -12
View File
@@ -51,17 +51,17 @@ private:
const css::uno::Reference< css::graphic::XGraphic >&
mxGraphic;
OUString const msEstimatedSizePix1;
OUString const msEstimatedSizePix2;
OUString const msEstimatedSizeVec;
OUString msEstimatedSizePix1;
OUString msEstimatedSizePix2;
OUString msEstimatedSizeVec;
OUString const ms1BitThreshold;
OUString const ms1BitDithered;
OUString const ms4BitGrayscale;
OUString const ms4BitColorPalette;
OUString const ms8BitGrayscale;
OUString const ms8BitColorPalette;
OUString const ms24BitColor;
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;
+1 -1
View File
@@ -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:
+2 -2
View File
@@ -48,9 +48,9 @@ namespace {
struct SvtExtensionResIdMapping_Impl
{
const char* _pExt;
bool const _bExt;
bool _bExt;
const char* pStrId;
SvImageId const _nImgId;
SvImageId _nImgId;
};
}
+1 -1
View File
@@ -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")
+2 -2
View File
@@ -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 );
+3 -3
View File
@@ -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 },
+2 -2
View File
@@ -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:
+1 -1
View File
@@ -108,7 +108,7 @@ private:
static rtl::Reference<PropertySetInfo> createPropertySetInfo( sal_uInt16 nType );
sal_uInt16 const mnType;
sal_uInt16 mnType;
OUString maURL;
OUString maAltText;
+1 -1
View File
@@ -41,7 +41,7 @@ class FileControl final : public vcl::Window
{
VclPtr<Edit> maEdit;
VclPtr<PushButton> maButton;
OUString const maButtonText;
OUString maButtonText;
FileControlMode_Internal mnInternalFlags;
void Resize() override;
+1 -1
View File
@@ -122,7 +122,7 @@ class SvxIconChoiceCtrl_Impl
Idle aVisRectChangedIdle;
Idle aCallSelectHdlIdle;
Size aVirtOutputSize;
Size const aImageSize;
Size aImageSize;
Size aDefaultTextSize;
Size aOutputSize; // Pixel
VclPtr<SvtIconChoiceCtrl> pView;
+2 -2
View File
@@ -37,8 +37,8 @@ public:
sal_uInt16 mnId;
HeaderBarItemBits mnBits;
long mnSize;
OString const maHelpId;
Image const maImage;
OString maHelpId;
Image maImage;
OUString maOutText;
OUString maText;
OUString maHelpText;
+1 -1
View File
@@ -151,7 +151,7 @@ namespace {
class FindByType
{
SvLBoxItemType const meType;
SvLBoxItemType meType;
public:
explicit FindByType(SvLBoxItemType eType) : meType(eType) {}
bool operator() (const std::unique_ptr<SvLBoxItem>& rpItem) const