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>

46 files changed, 110 insertions, 110 deletions

diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
index 9edb5e2f3616..c7a460770b98 100644
--- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
@@ -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 );
 
diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx
index dfd669d9f396..9bf4dca06e0f 100644
--- a/fpicker/source/office/fileview.hxx
+++ b/fpicker/source/office/fileview.hxx
@@ -175,7 +175,7 @@ public:
 
 struct SvtContentEntry
 {
-    bool const     mbIsFolder;
+    bool     mbIsFolder;
     OUString maURL;
 
     SvtContentEntry( const OUString& rURL, bool bIsFolder ) :
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index f7c4919a1c3f..49486aae972a 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -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)
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 60f1ab0510dc..a86722a7a603 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -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,
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 8b6d976cc5da..29b2e3ffda03 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -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 );
diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx
index a2ba1a22e3fd..aaa2ee61be46 100644
--- a/include/svtools/editsyntaxhighlighter.hxx
+++ b/include/svtools/editsyntaxhighlighter.hxx
@@ -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);
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index ba7a20e11dfb..054ac94fdc23 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -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;
diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx
index 16c724487bfe..a6787cc24795 100644
--- a/include/svtools/embedtransfer.hxx
+++ b/include/svtools/embedtransfer.hxx
@@ -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;
 
diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx
index ec8d8a41fdac..e90db3fb29e6 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -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);
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index 9ddb44c0547f..3f3e4464cbed 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -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;
         };
 
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 5de8360987ad..7543f7335785 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -36,7 +36,7 @@ struct HTMLOutEvent
 {
     const char *pBasicName;
     const char *pJavaName;
-    SvMacroItemId const nEvent;
+    SvMacroItemId nEvent;
 };
 
 struct SVT_DLLPUBLIC HTMLOutContext
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index a00762af8a3a..2bd863ddc96a 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -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
diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx
index 3d39c116d372..0d59f4667667 100644
--- a/include/svtools/place.hxx
+++ b/include/svtools/place.hxx
@@ -18,7 +18,7 @@ private:
     OUString msName;
     INetURLObject maUrl;
 
-    bool const mbEditable;
+    bool mbEditable;
 
 public:
 
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 2872fbf82073..686b50a96d48 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -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
 };
 
 
diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index 8eb05b4798f2..129a7af57f46 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -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;
         };
 
diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx
index 6f65b746180b..de6e57264137 100644
--- a/include/svtools/stringtransfer.hxx
+++ b/include/svtools/stringtransfer.hxx
@@ -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;
     };
 
 
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index 0ec7228fe5a8..b97c0e15b11a 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -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;
         };
 
diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx
index 0d4cdfd0ac07..46335a5d2c86 100644
--- a/include/svtools/unoevent.hxx
+++ b/include/svtools/unoevent.hxx
@@ -41,7 +41,7 @@ enum class SvMacroItemId : sal_uInt16;
 */
 struct SvEventDescription
 {
-    SvMacroItemId const mnEvent;
+    SvMacroItemId mnEvent;
     const char* mpEventName;
 };
 
diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx
index e2217b87b6e8..5cf03071b22a 100644
--- a/include/vcl/imap.hxx
+++ b/include/vcl/imap.hxx
@@ -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; }
diff --git a/include/vcl/ivctrl.hxx b/include/vcl/ivctrl.hxx
index 82e44af84a79..adadcc9fefc4 100644
--- a/include/vcl/ivctrl.hxx
+++ b/include/vcl/ivctrl.hxx
@@ -58,7 +58,7 @@ enum class SvxIconChoiceCtrlPositionMode
 
 class SvxIconChoiceCtrlEntry
 {
-    Image const aImage;
+    Image aImage;
 
     OUString aText;
     OUString aQuickHelpText;
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index 030d6312e0ba..915730390f7a 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -734,7 +734,7 @@ public:
 
 class SvInplaceEdit2
 {
-    Link<SvInplaceEdit2&,void> const aCallBackHdl;
+    Link<SvInplaceEdit2&,void> aCallBackHdl;
     Accelerator   aAccReturn;
     Accelerator   aAccEscape;
     Idle          aIdle;
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;
diff --git a/toolkit/inc/controls/filectrl.hxx b/toolkit/inc/controls/filectrl.hxx
index cb01ff29b0fe..2aea66f3936e 100644
--- a/toolkit/inc/controls/filectrl.hxx
+++ b/toolkit/inc/controls/filectrl.hxx
@@ -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;
diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx
index 54a95ce42a1b..797cf6ebb9be 100644
--- a/vcl/source/control/imivctl.hxx
+++ b/vcl/source/control/imivctl.hxx
@@ -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;
diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx
index a841223f3ee0..fead6923b20a 100644
--- a/vcl/source/treelist/headbar.cxx
+++ b/vcl/source/treelist/headbar.cxx
@@ -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;
diff --git a/vcl/source/treelist/treelistentry.cxx b/vcl/source/treelist/treelistentry.cxx
index d380866cfc7a..5ffd4428b758 100644
--- a/vcl/source/treelist/treelistentry.cxx
+++ b/vcl/source/treelist/treelistentry.cxx
@@ -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