Revert "loplugin:constfields in sfx2"

This reverts commit 8411b80d46765f1ddd4e37aa634ec963dcf4b04f.

Change-Id: Ibf3aa3ce4bfedf9d47001ad824db7c48ff093a21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90416
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

27 files changed, 57 insertions, 57 deletions

diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx
index 0a1c67063776..fc4da7a33d71 100644
--- a/include/sfx2/StylePreviewRenderer.hxx
+++ b/include/sfx2/StylePreviewRenderer.hxx
@@ -25,7 +25,7 @@ protected:
     const SfxObjectShell& mrShell;
     OutputDevice& mrOutputDev;
     SfxStyleSheetBase* mpStyle;
-    long const mnMaxHeight;
+    long mnMaxHeight;
 
 public:
     enum class RenderAlign
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 054f1ff0a0f5..f7d639e927c6 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -90,8 +90,8 @@ typedef std::unique_ptr<SfxChildWindowContext> (*SfxChildWinContextCtor)( vcl::W
                                             SfxChildWinInfo *pInfo);
 struct SfxChildWinContextFactory
 {
-    SfxChildWinContextCtor const  pCtor;      // Factory method
-    sal_uInt16 const              nContextId; // Identifier for SfxInterface
+    SfxChildWinContextCtor  pCtor;      // Factory method
+    sal_uInt16              nContextId; // Identifier for SfxInterface
 
     SfxChildWinContextFactory( SfxChildWinContextCtor pTheCtor, sal_uInt16 nID )
         : pCtor(pTheCtor)
@@ -103,10 +103,10 @@ class SfxChildWinContextArr_Impl;
 
 struct SFX2_DLLPUBLIC SfxChildWinFactory
 {
-    SfxChildWinCtor const       pCtor;  // Factory method
-    sal_uInt16 const            nId;    // ChildWindow-Id ( SlotId )
+    SfxChildWinCtor             pCtor;  // Factory method
+    sal_uInt16                  nId;    // ChildWindow-Id ( SlotId )
     SfxChildWinInfo             aInfo;  // Configuration
-    sal_uInt16 const            nPos;   // Position in UI
+    sal_uInt16                  nPos;   // Position in UI
     std::unique_ptr<SfxChildWinContextArr_Impl> pArr;   // Array for Contexts
 
     SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID, sal_uInt16 n );
@@ -142,7 +142,7 @@ public:
 class SFX2_DLLPUBLIC SfxChildWindow
 {
     VclPtr<vcl::Window>        pParent;         // parent window ( Topwindow )
-    sal_uInt16 const           nType;           // ChildWindow-Id
+    sal_uInt16                 nType;           // ChildWindow-Id
     VclPtr<vcl::Window>        pWindow;         // actual contents
     std::shared_ptr<SfxDialogController> xController;     // actual contents
     SfxChildAlignment          eChildAlignment; // Current css::drawing::Alignment
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 2501e44903bd..90a479c099a5 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -57,7 +57,7 @@ private:
     OUString                     m_AutoloadURL;
     bool                         m_isAutoloadEnabled;
     OUString                     m_DefaultTarget;
-    OUString const               m_TemplateName;
+    OUString                     m_TemplateName;
     OUString                     m_Author;
     css::util::DateTime          m_CreationDate;
     OUString                     m_ModifiedBy;
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 393bc39e12c2..80bb7734d970 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -52,7 +52,7 @@ class SFX2_DLLPUBLIC SfxFilter
      * Custom provider name in case the filter is provided via external
      * libraries.  Empty for conventional filter types.
      */
-    OUString const maProvider;
+    OUString        maProvider;
 
     SfxFilterFlags  nFormatType;
     sal_Int32       nVersion;
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index ae819299079c..ab75ddd187b7 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -40,8 +40,8 @@ namespace sfx2 {
 class SFX2_DLLPUBLIC DocumentInserter
 {
 private:
-    weld::Window* const     m_pParent;
-    OUString const          m_sDocFactory;
+    weld::Window*           m_pParent;
+    OUString                m_sDocFactory;
     OUString                m_sFilter;
     Link<sfx2::FileDialogHelper*,void> m_aDialogClosedLink;
 
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 5afbf306419e..9f7cd304a038 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -190,9 +190,9 @@ inline std::basic_ostream<charT, traits> & operator <<(
 
 class SFX2_DLLPUBLIC SfxEventHint : public SfxHint
 {
-    SfxObjectShell* const     pObjShell;
-    OUString const            aEventName;
-    SfxEventHintId const      nEventId;
+    SfxObjectShell*     pObjShell;
+    OUString            aEventName;
+    SfxEventHintId      nEventId;
 
 public:
     SfxEventHint( SfxEventHintId nId, const OUString& aName, SfxObjectShell *pObj )
@@ -233,8 +233,8 @@ public:
 
 class SfxPrintingHint final : public SfxViewEventHint
 {
-    css::view::PrintableState const mnPrintableState;
-    css::uno::Sequence < css::beans::PropertyValue > const aOpts;
+    css::view::PrintableState mnPrintableState;
+    css::uno::Sequence < css::beans::PropertyValue > aOpts;
 public:
         SfxPrintingHint(
                 css::view::PrintableState nState,
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index 6d62f8cfa561..86f20bf111c7 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -99,7 +99,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter
 
 {
     SfxFilterFlags nOrMask;
-    SfxFilterFlags const nAndMask;
+    SfxFilterFlags nAndMask;
     sal_uInt16 nCurrent;
     const SfxFilterMatcher_Impl &m_rMatch;
 
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index 0c866f70de5f..08de31318517 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -45,7 +45,7 @@ public:
 class SFX2_DLLPUBLIC SfxInfoBarContainerChild final : public SfxChildWindow
 {
 private:
-    SfxBindings* const m_pBindings;
+    SfxBindings* m_pBindings;
 
 public:
     SfxInfoBarContainerChild(vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings,
@@ -62,7 +62,7 @@ public:
 class SFX2_DLLPUBLIC SfxInfoBarWindow final : public vcl::Window
 {
 private:
-    OUString const m_sId;
+    OUString m_sId;
     InfobarType m_eType;
     VclPtr<FixedImage> m_pImage;
     VclPtr<FixedText> m_pPrimaryMessage;
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index fe6706544b20..b4f21227704e 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
@@ -102,7 +102,7 @@ public:
 
         css::uno::Reference<css::io::XInputStream>
              m_xInputStreamToLoadFrom;
-        bool const m_bIsReadOnly;
+        bool m_bIsReadOnly;
     };
 
     StreamToLoadFrom getStreamToLoadFrom();
diff --git a/include/sfx2/lokcharthelper.hxx b/include/sfx2/lokcharthelper.hxx
index 2a921d0fa009..8998010d1258 100644
--- a/include/sfx2/lokcharthelper.hxx
+++ b/include/sfx2/lokcharthelper.hxx
@@ -24,7 +24,7 @@ class VirtualDevice;
 class SFX2_DLLPUBLIC LokChartHelper
 {
 private:
-    SfxViewShell* const mpViewShell;
+    SfxViewShell* mpViewShell;
     css::uno::Reference<css::frame::XController> mxController;
     css::uno::Reference<css::frame::XDispatch> mxDispatcher;
     VclPtr<vcl::Window> mpWindow;
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index 8727b7815abd..6a3eb5a65738 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -32,7 +32,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem final : public SfxPoolItem
     OUString                aLibName;
     OUString                aModuleName;
     OUString                aMethodName;
-    OUString const          aCommentText;
+    OUString                aCommentText;
 
 public:
     static SfxPoolItem* CreateDefault();
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 7f9eb2de916b..5e5a15f1d3db 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -102,9 +102,9 @@ template<class T> SfxPoolItem* createSfxPoolItem()
 }
 struct SfxType
 {
-    std::function<SfxPoolItem* ()> const createSfxPoolItemFunc;
+    std::function<SfxPoolItem* ()> createSfxPoolItemFunc;
     const std::type_info*   pType;
-    sal_uInt16 const        nAttribs;
+    sal_uInt16          nAttribs;
     SfxTypeAttrib   aAttrib[1]; // variable length
 
     const std::type_info* Type() const{return pType;}
@@ -114,9 +114,9 @@ struct SfxType
 
 struct SfxType0
 {
-    std::function<SfxPoolItem* ()> const createSfxPoolItemFunc;
-    const std::type_info*    pType;
-    sal_uInt16 const         nAttribs;
+    std::function<SfxPoolItem* ()> createSfxPoolItemFunc;
+    const std::type_info*   pType;
+    sal_uInt16          nAttribs;
     const std::type_info*    Type() const { return pType;}
 };
 #define SFX_DECL_TYPE(n)    struct SfxType##n                   \
@@ -171,9 +171,9 @@ SFX_DECL_TYPE(23); // for SvxSearchItem
 
 struct SfxFormalArgument
 {
-    const SfxType*   pType;    // Type of the parameter (SfxPoolItem subclass)
-    const char*      pName;    // Name of the sParameters
-    sal_uInt16 const nSlotId;  // Slot-Id for identification of the Parameters
+    const SfxType*  pType;    // Type of the parameter (SfxPoolItem subclass)
+    const char*     pName;    // Name of the sParameters
+    sal_uInt16      nSlotId;  // Slot-Id for identification of the Parameters
 
     std::unique_ptr<SfxPoolItem> CreateItem() const
                             { return pType->CreateItem(); }
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index e8e974cf366e..9be8586c710e 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -63,7 +63,7 @@ class SFX2_DLLPUBLIC SfxNewFileDialog final : public SfxDialogController
 {
 private:
     Idle m_aPrevIdle;
-    SfxNewFileDialogMode const m_nFlags;
+    SfxNewFileDialogMode m_nFlags;
     SfxDocumentTemplates m_aTemplates;
     SfxObjectShellLock m_xDocShell;
 
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 32f23200afbd..bda6ecc05462 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -60,8 +60,8 @@ friend class SfxSlotPool;
     const SfxInterface*     pGenoType;      // base interface
     SfxSlot*                pSlots;         // SlotMap
     sal_uInt16              nCount;         // number of slots in SlotMap
-    SfxInterfaceId const    nClassId;       // Id of interface
-    bool const              bSuperClass;    // Whether children inherit its toolbars etc
+    SfxInterfaceId          nClassId;       // Id of interface
+    bool                    bSuperClass;    // Whether children inherit its toolbars etc
     std::unique_ptr<SfxInterface_Impl>      pImplData;
 
 public:
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index b7374aa8a4f4..7fb199c88ab1 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
@@ -27,7 +27,7 @@ class SfxShell;
 
 class SFX2_DLLPUBLIC SfxObjectItem final : public SfxPoolItem
 {
-    SfxShell* const          _pSh;
+    SfxShell*                _pSh;
 
 public:
                              static SfxPoolItem* CreateDefault();
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index dd2712889517..cbbbf7a4a33d 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -63,9 +63,9 @@ private:
 
     std::unique_ptr<weld::Button> m_xOKBtn;
 
-    OUString const  maMinLenPwdStr;
-    OUString const  maMinLenPwdStr1;
-    OUString const  maEmptyPwdStr;
+    OUString        maMinLenPwdStr;
+    OUString        maMinLenPwdStr1;
+    OUString        maEmptyPwdStr;
     OUString        maMainPwdStr;
     sal_uInt16      mnMinLen;
     SfxShowExtras  mnExtras;
diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx
index ab7070c79af2..0cab447c8fb5 100644
--- a/include/sfx2/sfxhtml.hxx
+++ b/include/sfx2/sfxhtml.hxx
@@ -37,7 +37,7 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
 {
     OUString                aScriptType;
 
-    SfxMedium* const        pMedium;
+    SfxMedium*              pMedium;
     std::unique_ptr<SfxMedium> pDLMedium;   // Medium for Download Files
 
     ScriptType eScriptType;
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index 01ffb8518e9c..13cbe7376c06 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -63,7 +63,7 @@ class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
         SfxStatusListener( const SfxStatusListener& ) = delete;
         SfxStatusListener& operator=( const SfxStatusListener& ) = delete;
 
-        sal_uInt16 const                                      m_nSlotID;
+        sal_uInt16                                            m_nSlotID;
         css::util::URL                                        m_aCommand;
         css::uno::Reference< css::frame::XDispatchProvider >  m_xDispatchProvider;
         css::uno::Reference< css::frame::XDispatch >          m_xDispatch;
diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx
index 98c4c75602a4..490e2d8548f0 100644
--- a/include/sfx2/sidebar/AsynchronousCall.hxx
+++ b/include/sfx2/sidebar/AsynchronousCall.hxx
@@ -42,7 +42,7 @@ public:
     void Sync();
 
 private:
-    Action const maAction;
+    Action maAction;
     ImplSVEvent * mnCallId;
 
     DECL_LINK(HandleUserCall, void*, void);
diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx
index 816aacf5c42f..8d3972c71996 100644
--- a/include/sfx2/sidebar/ResourceManager.hxx
+++ b/include/sfx2/sidebar/ResourceManager.hxx
@@ -107,7 +107,7 @@ private:
     mutable std::set<OUString> maProcessedApplications;
     std::map<OUString, OUString> maLastActiveDecks;
 
-    SvtMiscOptions const maMiscOptions;
+    SvtMiscOptions maMiscOptions;
 
     void ReadDeckList();
     void ReadPanelList();
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 9d57b90a2039..909b90ef9a50 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -106,7 +106,7 @@ private:
     ItemContainer maItems;
     const ::std::function<void (const OUString& rsDeckId)> maDeckActivationFunctor;
     sal_Int32 mnMenuSeparatorY;
-    PopupMenuProvider const maPopupMenuProvider;
+    PopupMenuProvider maPopupMenuProvider;
 
     VclPtr<RadioButton> CreateTabItem (const DeckDescriptor& rDeckDescriptor);
     Image GetItemImage (const DeckDescriptor& rDeskDescriptor) const;
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index e49a81e78e88..8929e2efb2f3 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -38,9 +38,9 @@ typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal
 
 struct SfxStbCtrlFactory
 {
-    SfxStatusBarControlCtor const pCtor;
+    SfxStatusBarControlCtor pCtor;
     const std::type_info&   nTypeId;
-    sal_uInt16 const        nSlotId;
+    sal_uInt16              nSlotId;
 
     SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor,
             const std::type_info& nTheTypeId, sal_uInt16 nTheSlotId ):
@@ -57,8 +57,8 @@ class UserDrawEvent;
 
 class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController
 {
-    sal_uInt16 const   nSlotId;
-    sal_uInt16 const   nId;
+    sal_uInt16         nSlotId;
+    sal_uInt16         nId;
     VclPtr<StatusBar>  pBar;
 
 protected:
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index b144c840cd8e..fea8d735796b 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -28,7 +28,7 @@
 
 struct SFX2_DLLPUBLIC SfxFilterTuple
 {
-    OUString const aName;
+    OUString aName;
     SfxStyleSearchBits nFlags;
     SfxFilterTuple(const OUString& rName, SfxStyleSearchBits nArg)
         : aName(rName)
@@ -41,9 +41,9 @@ typedef std::vector<SfxFilterTuple> SfxStyleFilter;
 
 class SFX2_DLLPUBLIC SfxStyleFamilyItem
 {
-    SfxStyleFamily const  nFamily;
-    OUString const        aText;
-    Image const           aImage;
+    SfxStyleFamily  nFamily;
+    OUString        aText;
+    Image           aImage;
     SfxStyleFilter  aFilterList;
 
 public:
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index f12878564e87..d812aed6ee3e 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -40,9 +40,9 @@ typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uIn
 
 struct SfxTbxCtrlFactory
 {
-    SfxToolBoxControlCtor const   pCtor;
-    const std::type_info&         nTypeId;
-    sal_uInt16 const              nSlotId;
+    SfxToolBoxControlCtor       pCtor;
+    const std::type_info&       nTypeId;
+    sal_uInt16                  nSlotId;
 
     SfxTbxCtrlFactory( SfxToolBoxControlCtor pTheCtor,
             const std::type_info& nTheTypeId, sal_uInt16 nTheSlotId ):
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 098ffa33e6dc..3ed02ac9037a 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -59,7 +59,7 @@ public:
 
 private:
 
-    FILTER_APPLICATION const mApp;
+    FILTER_APPLICATION mApp;
 };
 
 
diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index 476fd01f9f16..efd511ea2b3d 100644
--- a/include/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.hxx
@@ -50,8 +50,8 @@ public:
     OUString      GetAPIViewName() const;
 
 private:
-    SfxViewCtor const     fnCreate;
-    SfxInterfaceId const  nOrd;
+    SfxViewCtor     fnCreate;
+    SfxInterfaceId  nOrd;
     const OUString  m_sViewName;
 };
 
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 7f8be83f0aa7..0a40a4179afc 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -250,7 +250,7 @@ private:
 
 class SFX2_DLLPUBLIC SfxViewFrameItem final : public SfxPoolItem
 {
-    SfxViewFrame* const     pFrame;
+    SfxViewFrame*           pFrame;
 
 public:
                             SfxViewFrameItem( SfxViewFrame *pViewFrame ):