diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-12 08:55:15 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-12 09:22:20 +0100 |
commit | b480819dc4133f587eb960143128a7d85a44da9a (patch) | |
tree | b7677157cbae13afc4c87e4621545bffbc61c726 /reportdesign/source/ui/inc | |
parent | b271cc46851c61ddef20dc869bf339c857f76b18 (diff) |
Revert "loplugin:constfields in reportdesign,sal,sax"
This reverts commit d4d37662b090cb237585156a47cd8e1f1cbe2656.
Now that we know that making fields has negative side effects
like disabling assignment operator generation.
Change-Id: Idef4937b89a83d2efbfaf0ab87d059a0143c0164
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90364
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/source/ui/inc')
-rw-r--r-- | reportdesign/source/ui/inc/ColorListener.hxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ColumnInfo.hxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/DesignView.hxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/FunctionHelper.hxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/GroupsSorting.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/RptUndo.hxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ViewsWindow.hxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/dlgedclip.hxx | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index 2958437fe72b..0f8a89acad9e 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -32,9 +32,9 @@ namespace rptui void operator =(const OColorListener&) = delete; protected: Link<OColorListener&,void> m_aCollapsedLink; - svtools::ColorConfig const m_aColorConfig; + svtools::ColorConfig m_aColorConfig; svtools::ExtendedColorConfig m_aExtendedColorConfig; - OUString const m_sColorEntry; + OUString m_sColorEntry; Color m_nColor; Color m_nTextBoundaries; bool m_bCollapsed; diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx index 6a9a2e360960..65062f9dc136 100644 --- a/reportdesign/source/ui/inc/ColumnInfo.hxx +++ b/reportdesign/source/ui/inc/ColumnInfo.hxx @@ -25,8 +25,8 @@ namespace rptui { struct ColumnInfo { - OUString const sColumnName; - OUString const sLabel; + OUString sColumnName; + OUString sLabel; ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel) : sColumnName(i_sColumnName) , sLabel(i_sLabel) diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 7b904b22db11..a8c979879711 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -69,8 +69,8 @@ namespace rptui Idle m_aMarkIdle; DlgEdMode m_eMode; sal_uInt16 m_eActObj; - Size const m_aGridSizeCoarse; - Size const m_aGridSizeFine; + Size m_aGridSizeCoarse; + Size m_aGridSizeFine; bool m_bDeleted; diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 4d94f6f40bd9..df18ed34cb36 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -83,8 +83,8 @@ class FunctionCategory : public formula::IFunctionCategory { mutable ::std::vector< std::shared_ptr< FunctionDescription > > m_aFunctions; css::uno::Reference< css::report::meta::XFunctionCategory> m_xCategory; - sal_uInt32 const m_nFunctionCount; - sal_uInt32 const m_nNumber; + sal_uInt32 m_nFunctionCount; + sal_uInt32 m_nNumber; const FunctionManager* m_pFunctionManager; public: FunctionCategory(const FunctionManager* _pFMgr,sal_uInt32 _nPos,const css::uno::Reference< css::report::meta::XFunctionCategory>& _xCategory); diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 17a6e517e824..405c5c0bc2a3 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -58,7 +58,7 @@ class OGroupsSortingDialog : public weld::GenericDialogController ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; css::uno::Reference< css::report::XGroups> m_xGroups; css::uno::Reference< css::container::XNameAccess > m_xColumns; - bool const m_bReadOnly; + bool m_bReadOnly; std::unique_ptr<weld::Toolbar> m_xToolBox; std::unique_ptr<weld::Widget> m_xProperties; diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index cf2bd6e50196..9c125121b9e1 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -42,8 +42,8 @@ namespace rptui m_aControls; ::std::vector< ::std::pair< OUString ,css::uno::Any> > m_aValues; - Action const m_eAction; - sal_uInt16 const m_nSlot; + Action m_eAction; + sal_uInt16 m_nSlot; bool m_bInserted; virtual void implReInsert( ) = 0; @@ -114,7 +114,7 @@ namespace rptui { css::uno::Reference< css::report::XGroup> m_xGroup; ///<! the group for the undo redo action css::uno::Reference< css::report::XReportDefinition > m_xReportDefinition; ///<! the parent report definition - Action const m_eAction; ///<! the current action + Action m_eAction; ///<! the current action sal_Int32 m_nLastPosition; ///<! the last position of the group void implReInsert( ); diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index d668df78ab4f..fb7674138066 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -47,8 +47,8 @@ namespace rptui struct RectangleLess { enum CompareMode { POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL }; - CompareMode const m_eCompareMode; - Point const m_aRefPoint; + CompareMode m_eCompareMode; + Point m_aRefPoint; RectangleLess(CompareMode _eCompareMode,const Point& _rRefPoint ) : m_eCompareMode(_eCompareMode),m_aRefPoint(_rRefPoint){} bool operator() (const tools::Rectangle& lhs, const tools::Rectangle& rhs) const { diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx index d4974ed7c40a..54a0baab3a3a 100644 --- a/reportdesign/source/ui/inc/dlgedclip.hxx +++ b/reportdesign/source/ui/inc/dlgedclip.hxx @@ -72,7 +72,7 @@ protected: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; private: - TSectionElements const m_aCopyElements; + TSectionElements m_aCopyElements; }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX |