Revert "loplugin:constfields in sdext"

This reverts commit 565746cf861c407ae222b2284d8525b4e9a62d94.

Now that we know that making fields has negative side effects
like disabling assignment operator generation.

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

16 files changed, 42 insertions, 42 deletions

diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx
index a83e272fe291..f989a95ad39c 100644
--- a/sdext/source/minimizer/graphiccollector.hxx
+++ b/sdext/source/minimizer/graphiccollector.hxx
@@ -33,11 +33,11 @@
 
 struct GraphicSettings
 {
-    bool const    mbJPEGCompression;
-    sal_Int32 const   mnJPEGQuality;
+    bool    mbJPEGCompression;
+    sal_Int32   mnJPEGQuality;
     bool    mbRemoveCropArea;
-    sal_Int32 const   mnImageResolution;
-    bool const    mbEmbedLinkedGraphics;
+    sal_Int32   mnImageResolution;
+    bool    mbEmbedLinkedGraphics;
 
     GraphicSettings( bool bJPEGCompression, sal_Int32 nJPEGQuality, bool bRemoveCropArea,
                         sal_Int32 nImageResolution, bool bEmbedLinkedGraphics )
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 274e159895bc..761a40e01e7e 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -57,9 +57,9 @@ private:
 
     void InitDialog();
 
-    sal_Int64 const mnSourceSize;
-    sal_Int64 const mnDestSize;
-    sal_Int64 const mnApproxSize;
+    sal_Int64 mnSourceSize;
+    sal_Int64 mnDestSize;
+    sal_Int64 mnApproxSize;
     bool& mrbOpenNewDocument;
     const OUString& maSaveAsURL;
 };
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index d4d4c99c4ba5..255654838880 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -37,7 +37,7 @@ namespace {
 struct TokenTable
 {
     const char*                         pS;
-    PPPOptimizerTokenEnum const         pE;
+    PPPOptimizerTokenEnum               pE;
 };
 
 }
diff --git a/sdext/source/pdfimport/inc/genericelements.hxx b/sdext/source/pdfimport/inc/genericelements.hxx
index 177533501f3f..d29540036f07 100644
--- a/sdext/source/pdfimport/inc/genericelements.hxx
+++ b/sdext/source/pdfimport/inc/genericelements.hxx
@@ -122,7 +122,7 @@ namespace pdfi
     public:
         virtual void visitedBy( ElementTreeVisitor&, const std::list< std::unique_ptr<Element> >::const_iterator& ) override;
 
-        OUString const URI;
+        OUString URI;
     };
 
     struct GraphicalElement : public Element
@@ -234,7 +234,7 @@ namespace pdfi
     public:
         virtual void visitedBy( ElementTreeVisitor&, const std::list< std::unique_ptr<Element> >::const_iterator& ) override;
 
-        ImageId const Image;
+        ImageId Image;
     };
 
     struct PageElement : public Element
@@ -257,7 +257,7 @@ namespace pdfi
         void resolveFontStyles( PDFIProcessor const & rProc );
         void resolveUnderlines( PDFIProcessor const & rProc );
 
-        sal_Int32 const PageNumber;
+        sal_Int32      PageNumber;
         ListElement    Hyperlinks; // contains not yet realized links on this page
         double         TopMargin;
         double         BottomMargin;
diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
index 9e08d6a6a765..3305f0bf715e 100644
--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
@@ -198,10 +198,10 @@ namespace pdfi
             Element*  getCurElement(){ return m_pCurElement; }
 
         private:
-            Element* const              m_pCurElement ;
+            Element*                    m_pCurElement ;
             GraphicsContext             m_rCurrentContext ;
-            double const                m_Width ;
-            double const                m_PrevSpaceWidth ;
+            double                      m_Width ;
+            double                      m_PrevSpaceWidth ;
             OUString                    m_rGlyphs ;
     };
 }
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index af5fefe3af17..e255b1bb9a64 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -69,7 +69,7 @@ protected:
 
 struct PDFComment : public PDFEntry
 {
-    OString const  m_aComment;
+    OString  m_aComment;
 
     explicit PDFComment( const OString& rComment )
     : PDFEntry(), m_aComment( rComment ) {}
@@ -100,7 +100,7 @@ struct PDFName : public PDFValue
 
 struct PDFString : public PDFValue
 {
-    OString const  m_aString;
+    OString  m_aString;
 
     explicit PDFString( const OString& rString )
     : PDFValue(), m_aString( rString ) {}
@@ -113,7 +113,7 @@ struct PDFString : public PDFValue
 
 struct PDFNumber : public PDFValue
 {
-    double const m_fValue;
+    double m_fValue;
 
     explicit PDFNumber( double fVal )
     : PDFValue(), m_fValue( fVal ) {}
@@ -124,7 +124,7 @@ struct PDFNumber : public PDFValue
 
 struct PDFBool : public PDFValue
 {
-    bool const m_bValue;
+    bool m_bValue;
 
     explicit PDFBool( bool bVal )
     : PDFValue(), m_bValue( bVal ) {}
@@ -135,8 +135,8 @@ struct PDFBool : public PDFValue
 
 struct PDFObjectRef : public PDFValue
 {
-    unsigned int const    m_nNumber;
-    unsigned int const    m_nGeneration;
+    unsigned int    m_nNumber;
+    unsigned int    m_nGeneration;
 
     PDFObjectRef( unsigned int nNr, unsigned int nGen )
     : PDFValue(), m_nNumber( nNr ), m_nGeneration( nGen ) {}
@@ -201,8 +201,8 @@ struct PDFDict : public PDFContainer
 
 struct PDFStream : public PDFEntry
 {
-    unsigned int const    m_nBeginOffset;
-    unsigned int const    m_nEndOffset; // offset of the byte after the stream
+    unsigned int    m_nBeginOffset;
+    unsigned int    m_nEndOffset; // offset of the byte after the stream
     PDFDict*        m_pDict;
 
     PDFStream( unsigned int nBegin, unsigned int nEnd, PDFDict* pStreamDict )
@@ -259,7 +259,7 @@ struct PDFObject : public PDFContainer
     PDFEntry*       m_pObject;
     PDFStream*      m_pStream;
     unsigned int    m_nNumber;
-    unsigned int const m_nGeneration;
+    unsigned int    m_nGeneration;
 
     PDFObject( unsigned int nNr, unsigned int nGen )
     : m_pObject( nullptr ), m_pStream( nullptr ), m_nNumber( nNr ), m_nGeneration( nGen ) {}
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 41439cd5ba88..4eb7e7d96281 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -45,7 +45,7 @@ class PDFPasswordRequest:
 {
 private:
     mutable osl::Mutex            m_aMutex;
-    uno::Any const                m_aRequest;
+    uno::Any                      m_aRequest;
     OUString                 m_aPassword;
     bool                          m_bSelected;
 
diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx
index 13d86440d234..e26afcbc5237 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.hxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.hxx
@@ -37,8 +37,8 @@ namespace pdfi
     {
         struct AttrEntry
         {
-            OUString const m_aName;
-            OUString const m_aValue;
+            OUString m_aName;
+            OUString m_aValue;
 
             AttrEntry( const OUString& i_rName, const OUString& i_rValue )
             : m_aName( i_rName ), m_aValue( i_rValue ) {}
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index ee3282c5521e..b15f497dc481 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -79,7 +79,7 @@ namespace
     {
         const char*               pAsciiServiceName;
         const char*               pAsciiImplementationName;
-        ComponentFactory const    pFactory;
+        ComponentFactory          pFactory;
 
         ComponentDescription()
             :pAsciiServiceName( nullptr )
diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx
index 1eda41ea07a4..8aafe555f728 100644
--- a/sdext/source/pdfimport/tree/style.hxx
+++ b/sdext/source/pdfimport/tree/style.hxx
@@ -38,9 +38,9 @@ namespace pdfi
     public:
         struct Style
         {
-            OString const            Name;
-            PropertyMap const        Properties;
-            OUString const           Contents;
+            OString                  Name;
+            PropertyMap              Properties;
+            OUString                 Contents;
             Element*                 ContainedElement;
             std::vector< Style* >    SubStyles;
 
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 966306268a0b..ba57bb09b40b 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -73,7 +73,7 @@ namespace {
         SharedBitmapDescriptor mpBottom;
         SharedBitmapDescriptor mpBottomRight;
         SharedBitmapDescriptor mpBottomCallout;
-        SharedBitmapDescriptor const mpEmpty;
+        SharedBitmapDescriptor mpEmpty;
         PresenterTheme::SharedFontDescriptor mpFont;
         sal_Int32 mnFontXOffset;
         sal_Int32 mnFontYOffset;
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 4cf211598811..66bf66c6fcf4 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -109,7 +109,7 @@ namespace {
         virtual void Execute() override;
         virtual Any GetState() const override;
     private:
-        bool const mbOn;
+        bool mbOn;
         rtl::Reference<PresenterController> mpPresenterController;
     };
 
@@ -122,7 +122,7 @@ namespace {
         virtual void Execute() override;
         virtual Any GetState() const override;
     private:
-        bool const mbOn;
+        bool mbOn;
         rtl::Reference<PresenterController> mpPresenterController;
     };
 
@@ -135,7 +135,7 @@ namespace {
         virtual void Execute() override;
         virtual Any GetState() const override;
     private:
-        bool const mbOn;
+        bool mbOn;
         rtl::Reference<PresenterController> mpPresenterController;
     };
 
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 5867528ef96c..3ac4ecf8f38c 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -156,7 +156,7 @@ protected:
     double mnThumbSize;
     double mnLineHeight;
     css::geometry::RealPoint2D maDragAnchor;
-    ::std::function<void (double)> const maThumbMotionListener;
+    ::std::function<void (double)> maThumbMotionListener;
     Area meButtonDownArea;
     Area meMouseMoveArea;
     css::geometry::RealRectangle2D maBox[AreaCount];
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index f149bd01e40e..af3ba0b883ff 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -153,17 +153,17 @@ private:
     {
     public:
         Cell (const sal_Int32 nCharacterIndex, const sal_Int32 nCharacterCount, const double nCellWidth);
-        sal_Int32 const mnCharacterIndex;
-        sal_Int32 const mnCharacterCount;
-        double const mnCellWidth;
+        sal_Int32 mnCharacterIndex;
+        sal_Int32 mnCharacterCount;
+        double mnCellWidth;
     };
 
     class Line
     {
     public:
         Line (const sal_Int32 nLineStartCharacterIndex, const sal_Int32 nLineEndCharacterIndex);
-        sal_Int32 const mnLineStartCharacterIndex;
-        sal_Int32 const mnLineEndCharacterIndex;
+        sal_Int32 mnLineStartCharacterIndex;
+        sal_Int32 mnLineEndCharacterIndex;
         sal_Int32 mnLineStartCellIndex;
         sal_Int32 mnLineEndCellIndex;
         css::uno::Reference<css::rendering::XTextLayout> mxLayoutedLine;
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 282cdbf8a2e5..69b8fea28369 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -218,7 +218,7 @@ public:
         PresenterConfigurationAccess& rConfiguration,
         ReadContext& rReadContext);
 
-    OUString const msConfigurationNodeName;
+    OUString msConfigurationNodeName;
     std::shared_ptr<Theme> mpParentTheme;
     SharedBitmapDescriptor mpBackground;
     PaneStyleContainer maPaneStyles;
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index a08c3e6b8275..348a8ffab7e5 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -46,7 +46,7 @@ public:
         const sal_Int64 nRepeatInterval,
         const sal_Int32 nTaskId);
 
-    PresenterTimer::Task const maTask;
+    PresenterTimer::Task maTask;
     TimeValue maDueTime;
     const sal_Int64 mnRepeatInterval;
     const sal_Int32 mnTaskId;