From d4d37662b090cb237585156a47cd8e1f1cbe2656 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 11 Oct 2018 15:51:08 +0200
Subject: loplugin:constfields in reportdesign,sal,sax

and improve the rewriter so I spend less time fixing formatting

Change-Id: Ic2a6e5e31a5a202d2d02a47d77c484a57a5ec514
Reviewed-on: https://gerrit.libreoffice.org/61676
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 reportdesign/source/ui/inc/ColorListener.hxx            | 4 ++--
 reportdesign/source/ui/inc/ColumnInfo.hxx               | 4 ++--
 reportdesign/source/ui/inc/DesignView.hxx               | 4 ++--
 reportdesign/source/ui/inc/Formula.hxx                  | 2 +-
 reportdesign/source/ui/inc/FunctionHelper.hxx           | 4 ++--
 reportdesign/source/ui/inc/GroupsSorting.hxx            | 2 +-
 reportdesign/source/ui/inc/RptUndo.hxx                  | 6 +++---
 reportdesign/source/ui/inc/ViewsWindow.hxx              | 4 ++--
 reportdesign/source/ui/inc/dlgedclip.hxx                | 2 +-
 reportdesign/source/ui/inspection/DefaultInspection.cxx | 2 +-
 reportdesign/source/ui/misc/UITools.cxx                 | 4 ++--
 reportdesign/source/ui/report/ViewsWindow.cxx           | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'reportdesign/source/ui')

diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index 0f8a89acad9e..2958437fe72b 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                m_aColorConfig;
+        svtools::ColorConfig const          m_aColorConfig;
         svtools::ExtendedColorConfig        m_aExtendedColorConfig;
-        OUString                            m_sColorEntry;
+        OUString const                      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 65062f9dc136..6a9a2e360960 100644
--- a/reportdesign/source/ui/inc/ColumnInfo.hxx
+++ b/reportdesign/source/ui/inc/ColumnInfo.hxx
@@ -25,8 +25,8 @@ namespace rptui
 {
     struct ColumnInfo
     {
-        OUString sColumnName;
-        OUString sLabel;
+        OUString const sColumnName;
+        OUString const 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 fe9f7b20554e..1b09ff7f896f 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -70,8 +70,8 @@ namespace rptui
         Idle                                m_aMarkIdle;
         DlgEdMode                           m_eMode;
         sal_uInt16                          m_eActObj;
-        Size                                m_aGridSizeCoarse;
-        Size                                m_aGridSizeFine;
+        Size const                          m_aGridSizeCoarse;
+        Size const                          m_aGridSizeFine;
         bool                                m_bDeleted;
 
 
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index a2f4aa707692..68c20917af4f 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -46,7 +46,7 @@ class FormulaDialog : public formula::FormulaModalDialog,
                       public formula::IControlReferenceHandler
 {
     std::shared_ptr< formula::IFunctionManager > m_aFunctionManager;
-    formula::FormEditData*             m_pFormulaData;
+    formula::FormEditData* const       m_pFormulaData;
     VclPtr<OAddFieldWindow>            m_pAddField;
     css::uno::Reference < css::beans::XPropertySet >          m_xRowSet;
     css::uno::Reference< css::report::meta::XFormulaParser>   m_xParser;
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index df18ed34cb36..4d94f6f40bd9 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 m_nFunctionCount;
-    sal_uInt32 m_nNumber;
+    sal_uInt32 const m_nFunctionCount;
+    sal_uInt32 const 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 baa187dccb31..f8979053de55 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -80,7 +80,7 @@ class OGroupsSortingDialog :    public FloatingWindow
     ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                       m_pReportListener;
     css::uno::Reference< css::report::XGroups>            m_xGroups;
     css::uno::Reference< css::container::XNameAccess >    m_xColumns;
-    bool                                                  m_bReadOnly;
+    bool const                                            m_bReadOnly;
 private:
     DECL_LINK( OnControlFocusLost, Control&, void );
     DECL_LINK( OnControlFocusGot, Control&, void );
diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx
index 9c125121b9e1..cf2bd6e50196 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                                      m_eAction;
-        sal_uInt16                                  m_nSlot;
+        Action const                                m_eAction;
+        sal_uInt16 const                            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                                                                          m_eAction; ///<! the current action
+        Action const                                                                    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 1ac0e712632b..3a05a2ad7cd3 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 m_eCompareMode;
-        Point       m_aRefPoint;
+        CompareMode const m_eCompareMode;
+        Point const 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 e9965a2b8d0c..75ebfacf1785 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    m_aCopyElements;
+    TSectionElements const m_aCopyElements;
 };
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index b1479e1401a2..20ca09cc0d31 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -199,7 +199,7 @@ namespace rptui
         {
             const sal_Char* programmaticName;
             const char* uiNameResId;
-            OString    helpId;
+            OString const helpId;
         } aCategories[] = {
             { "General",    RID_STR_PROPPAGE_DEFAULT,   HID_RPT_PROPDLG_TAB_GENERAL },
             { "Data",       RID_STR_PROPPAGE_DATA,      HID_RPT_PROPDLG_TAB_DATA },
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 48b509663757..e11ba27ccf19 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -532,8 +532,8 @@ namespace
             lcl_pushBack( _out_rProperties, PROPERTY_CHARCASEMAP, uno::makeAny( pFontItem->GetEnumValue() ) );
         }
         struct Items {
-                sal_uInt16 nWhich;
-                OUString sPropertyName;
+                sal_uInt16 const nWhich;
+                OUString const sPropertyName;
         };
         const Items pItems[] = { {ITEMID_LANGUAGE,OUString(PROPERTY_CHARLOCALE)}
                                 ,{ITEMID_LANGUAGE_ASIAN,OUString(PROPERTY_CHARLOCALEASIAN)}
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 766e2ce045f1..d5b6261b9bf5 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -957,7 +957,7 @@ namespace
     class ApplySectionViewAction
     {
     private:
-        SectionViewAction   m_eAction;
+        SectionViewAction const m_eAction;
 
     public:
         explicit ApplySectionViewAction()
-- 
cgit