Revert "loplugin:constfields in svx"

This reverts commit 1a6397030381a45f27ab7a2a02e6e6d0f9987c84.

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

19 files changed, 107 insertions, 107 deletions

diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
index e877b61d37a4..cec8c0cbb2f6 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
@@ -123,7 +123,7 @@ public:
 
 class ViewContactOfGrid final : public ViewContactOfPageSubObject
 {
-    bool const                                        mbFront : 1;
+    bool                                        mbFront : 1;
 
     virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
     virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
@@ -137,7 +137,7 @@ public:
 
 class ViewContactOfHelplines final : public ViewContactOfPageSubObject
 {
-    bool const                                        mbFront : 1;
+    bool                                        mbFront : 1;
 
     virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
     virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
diff --git a/svx/inc/sdr/overlay/overlayhandle.hxx b/svx/inc/sdr/overlay/overlayhandle.hxx
index 4d86f2bfc000..fea09902bbc9 100644
--- a/svx/inc/sdr/overlay/overlayhandle.hxx
+++ b/svx/inc/sdr/overlay/overlayhandle.hxx
@@ -19,8 +19,8 @@ namespace sdr { namespace overlay {
 
 class OverlayHandle final : public OverlayObjectWithBasePosition
 {
-    basegfx::B2DSize const maSize;
-    Color const maStrokeColor;
+    basegfx::B2DSize maSize;
+    Color maStrokeColor;
 
     // geometry creation for OverlayObject
     virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx
index b46712eae8cb..84077f10367d 100644
--- a/svx/inc/sdr/overlay/overlayhelpline.hxx
+++ b/svx/inc/sdr/overlay/overlayhelpline.hxx
@@ -31,7 +31,7 @@ namespace sdr
         class OverlayHelplineStriped final : public OverlayObjectWithBasePosition
         {
             // remember HelpLineKind
-            SdrHelpLineKind const                             meKind;
+            SdrHelpLineKind                             meKind;
 
             // geometry creation for OverlayObject
             virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx
index c365f79d42eb..33ec22c0e25d 100644
--- a/svx/inc/sdr/overlay/overlayline.hxx
+++ b/svx/inc/sdr/overlay/overlayline.hxx
@@ -30,7 +30,7 @@ namespace sdr
         class OverlayLineStriped final : public OverlayObjectWithBasePosition
         {
             // second position in pixel
-            basegfx::B2DPoint const                       maSecondPosition;
+            basegfx::B2DPoint                       maSecondPosition;
 
             // geometry creation for OverlayObject
             virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx
index f03f7bd9b9bb..7f4dfd895eb3 100644
--- a/svx/inc/sdr/overlay/overlayrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrectangle.hxx
@@ -30,14 +30,14 @@ namespace sdr
         class OverlayRectangle final : public OverlayObjectWithBasePosition
         {
             // geometric definitions
-            basegfx::B2DPoint const         maSecondPosition;
+            basegfx::B2DPoint               maSecondPosition;
             const double                    mfTransparence;
             const double                    mfDiscreteGrow;
             const double                    mfDiscreteShrink;
             const double                    mfRotation;
 
             // #i53216# added CursorBlinkTime (in ms)
-            sal_uInt32 const                mnBlinkTime;
+            sal_uInt32                      mnBlinkTime;
 
             // Flag to remember which state to draw. Inited with false (0)
             bool                            mbOverlayState : 1;
diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
index d31ff48405c7..7a18f1cb4b8f 100644
--- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
@@ -33,10 +33,10 @@ namespace sdr
             basegfx::B2DPoint                       maSecondPosition;
 
             // Flag to switch on/off long lines to the OutputDevice bounds
-            bool const                              mbExtendedLines : 1;
+            bool                                    mbExtendedLines : 1;
 
             // Flag to switch on/off the bounds itself
-            bool const                              mbShowBounds : 1;
+            bool                                    mbShowBounds : 1;
 
             // geometry creation for OverlayObject
             virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx
index 5d0f07006e60..8649e866d7dd 100644
--- a/svx/inc/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/sdr/overlay/overlaytools.hxx
@@ -29,16 +29,16 @@ namespace drawinglayer { namespace primitive2d {
 class OverlayStaticRectanglePrimitive final : public DiscreteMetricDependentPrimitive2D
 {
 private:
-    basegfx::B2DPoint const maPosition;
-    basegfx::B2DSize const maSize;
+    basegfx::B2DPoint maPosition;
+    basegfx::B2DSize maSize;
 
     // the graphic definition
-    basegfx::BColor const maStrokeColor;
-    basegfx::BColor const maFillColor;
-    double const mfTransparence;
+    basegfx::BColor maStrokeColor;
+    basegfx::BColor maFillColor;
+    double mfTransparence;
 
     // the rotation of the primitive itself
-    double const mfRotation;
+    double mfRotation;
 
     virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
 
@@ -71,19 +71,19 @@ namespace drawinglayer
         {
         private:
             // The BitmapEx to use, PixelSize is used
-            BitmapEx const                                maBitmapEx;
+            BitmapEx                                maBitmapEx;
 
             // The logic position
-            basegfx::B2DPoint const                       maBasePosition;
+            basegfx::B2DPoint                       maBasePosition;
 
             // The pixel inside the BitmapEx which is assocciated with
             // the target position (offset in the bitmap)
-            sal_uInt16 const                              mnCenterX;
-            sal_uInt16 const                              mnCenterY;
+            sal_uInt16                              mnCenterX;
+            sal_uInt16                              mnCenterY;
 
             // evtl. rotation and shear around center
-            double const                                  mfShearX;
-            double const                                  mfRotation;
+            double                                  mfShearX;
+            double                                  mfRotation;
 
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
 
@@ -122,12 +122,12 @@ namespace drawinglayer
         {
         private:
             // The logic position
-            basegfx::B2DPoint const                       maBasePosition;
+            basegfx::B2DPoint                       maBasePosition;
 
             // The stripe colors and length
-            basegfx::BColor const                         maRGBColorA;
-            basegfx::BColor const                         maRGBColorB;
-            double const                                  mfDiscreteDashLength;
+            basegfx::BColor                          maRGBColorA;
+            basegfx::BColor                          maRGBColorB;
+            double                                   mfDiscreteDashLength;
 
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
 
@@ -163,18 +163,18 @@ namespace drawinglayer
         {
         private:
             // the logic rectangle definition
-            basegfx::B2DRange const               maObjectRange;
+            basegfx::B2DRange               maObjectRange;
 
             // the graphic definition
-            basegfx::BColor const                 maColor;
-            double const                          mfTransparence;
+            basegfx::BColor                 maColor;
+            double                          mfTransparence;
 
             // the discrete grow and shrink of the box
-            double const                          mfDiscreteGrow;
-            double const                          mfDiscreteShrink;
+            double                          mfDiscreteGrow;
+            double                          mfDiscreteShrink;
 
             // the rotation of the primitive itself
-            double const                          mfRotation;
+            double                          mfRotation;
 
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
 
@@ -221,15 +221,15 @@ namespace drawinglayer
         {
         private:
             // The logic position
-            basegfx::B2DPoint const                       maBasePosition;
+            basegfx::B2DPoint                       maBasePosition;
 
             // the style
-            HelplineStyle const                           meStyle;
+            HelplineStyle                           meStyle;
 
             // The stripe colors and length
-            basegfx::BColor const                         maRGBColorA;
-            basegfx::BColor const                         maRGBColorB;
-            double const                                  mfDiscreteDashLength;
+            basegfx::BColor                         maRGBColorA;
+            basegfx::BColor                         maRGBColorB;
+            double                                  mfDiscreteDashLength;
 
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
 
@@ -268,12 +268,12 @@ namespace drawinglayer
         {
         private:
             // The logic range
-            basegfx::B2DRange const                       maRollingRectangle;
+            basegfx::B2DRange                       maRollingRectangle;
 
             // The stripe colors and length
-            basegfx::BColor const                         maRGBColorA;
-            basegfx::BColor const                         maRGBColorB;
-            double const                                  mfDiscreteDashLength;
+            basegfx::BColor                         maRGBColorA;
+            basegfx::BColor                         maRGBColorB;
+            double                                  mfDiscreteDashLength;
 
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
 
diff --git a/svx/inc/sdr/overlay/overlaytriangle.hxx b/svx/inc/sdr/overlay/overlaytriangle.hxx
index 730671f80d83..76e481e645fb 100644
--- a/svx/inc/sdr/overlay/overlaytriangle.hxx
+++ b/svx/inc/sdr/overlay/overlaytriangle.hxx
@@ -28,8 +28,8 @@ namespace sdr
         class OverlayTriangle final : public OverlayObjectWithBasePosition
         {
             // second and third position in pixel
-            basegfx::B2DPoint const                       maSecondPosition;
-            basegfx::B2DPoint const                       maThirdPosition;
+            basegfx::B2DPoint                       maSecondPosition;
+            basegfx::B2DPoint                       maThirdPosition;
 
             // geometry creation for OverlayObject
             virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index a0ec102cab73..ec6cd2320e41 100644
--- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx
@@ -36,11 +36,11 @@ namespace drawinglayer
         class SdrCaptionPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
-            ::basegfx::B2DHomMatrix const               maTransform;
-            attribute::SdrLineFillShadowTextAttribute const   maSdrLFSTAttribute;
+            ::basegfx::B2DHomMatrix                     maTransform;
+            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
             ::basegfx::B2DPolygon                       maTail;
-            double const                                mfCornerRadiusX;    // [0.0..1.0] relative to 1/2 width
-            double const                                mfCornerRadiusY;    // [0.0..1.0] relative to 1/2 height
+            double                                      mfCornerRadiusX;    // [0.0..1.0] relative to 1/2 width
+            double                                      mfCornerRadiusY;    // [0.0..1.0] relative to 1/2 height
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index 64cfddc43203..f115283dc786 100644
--- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx
@@ -35,8 +35,8 @@ namespace drawinglayer
         class SdrConnectorPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
-            attribute::SdrLineShadowTextAttribute const       maSdrLSTAttribute;
-            ::basegfx::B2DPolygon const                       maUnitPolygon;
+            attribute::SdrLineShadowTextAttribute       maSdrLSTAttribute;
+            ::basegfx::B2DPolygon                       maUnitPolygon;
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 4012ed29613d..6ca417d340c5 100644
--- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -35,17 +35,17 @@ namespace drawinglayer
         class SdrCustomShapePrimitive2D : public BufferedDecompositionPrimitive2D
         {
         private:
-            attribute::SdrShadowTextAttribute const           maSdrSTAttribute;
-            Primitive2DContainer const                        maSubPrimitives;
-            basegfx::B2DHomMatrix const                       maTextBox;
+            attribute::SdrShadowTextAttribute           maSdrSTAttribute;
+            Primitive2DContainer                         maSubPrimitives;
+            basegfx::B2DHomMatrix                       maTextBox;
 
             // defines if SdrTextWordWrapItem was set at SdrObjCustomShape which means
             // that the text needs to be block formatted
-            bool const                                        mbWordWrap : 1;
+            bool                                        mbWordWrap : 1;
 
             // defines that the object contains/is a 3D AutoShape. Needed for
             // making exceptions with shadow generation
-            bool const                                        mb3DShape : 1;
+            bool                                        mb3DShape : 1;
 
         protected:
             // local decomposition.
diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
index 746d46a75585..9a498fdada90 100644
--- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx
@@ -35,8 +35,8 @@ namespace drawinglayer
         class SdrEllipsePrimitive2D : public BufferedDecompositionPrimitive2D
         {
         private:
-            ::basegfx::B2DHomMatrix const                     maTransform;
-            attribute::SdrLineFillShadowTextAttribute const   maSdrLFSTAttribute;
+            ::basegfx::B2DHomMatrix                     maTransform;
+            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -67,11 +67,11 @@ namespace drawinglayer
         class SdrEllipseSegmentPrimitive2D final : public SdrEllipsePrimitive2D
         {
         private:
-            double const                                      mfStartAngle;
-            double const                                      mfEndAngle;
+            double                                      mfStartAngle;
+            double                                      mfEndAngle;
 
-            bool const                                        mbCloseSegment : 1;
-            bool const                                        mbCloseUsingCenter : 1;
+            bool                                        mbCloseSegment : 1;
+            bool                                        mbCloseUsingCenter : 1;
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
index 2a317df334d6..e4e685bfa4d3 100644
--- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -36,9 +36,9 @@ namespace drawinglayer
         class SdrGrafPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
-            ::basegfx::B2DHomMatrix const                     maTransform;
-            attribute::SdrLineFillShadowTextAttribute const   maSdrLFSTAttribute;
-            GraphicObject const                               maGraphicObject;
+            ::basegfx::B2DHomMatrix                     maTransform;
+            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
+            GraphicObject                               maGraphicObject;
             GraphicAttr                                 maGraphicAttr;
 
             // local decomposition.
diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index aa666a4ec051..f4a3b5dc0290 100644
--- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -48,20 +48,20 @@ namespace drawinglayer
         class SdrMeasurePrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
-            attribute::SdrLineShadowTextAttribute const       maSdrLSTAttribute;
-            basegfx::B2DPoint const                           maStart;
-            basegfx::B2DPoint const                           maEnd;
-            MeasureTextPosition const                         meHorizontal;
-            MeasureTextPosition const                         meVertical;
-            double const                                      mfDistance;
-            double const                                      mfUpper;
-            double const                                      mfLower;
-            double const                                      mfLeftDelta;
-            double const                                      mfRightDelta;
-
-            bool const                                        mbBelow : 1;
-            bool const                                        mbTextRotation : 1;
-            bool const                                        mbTextAutoAngle : 1;
+            attribute::SdrLineShadowTextAttribute       maSdrLSTAttribute;
+            basegfx::B2DPoint                           maStart;
+            basegfx::B2DPoint                           maEnd;
+            MeasureTextPosition                         meHorizontal;
+            MeasureTextPosition                         meVertical;
+            double                                      mfDistance;
+            double                                      mfUpper;
+            double                                      mfLower;
+            double                                      mfLeftDelta;
+            double                                      mfRightDelta;
+
+            bool                                        mbBelow : 1;
+            bool                                        mbTextRotation : 1;
+            bool                                        mbTextAutoAngle : 1;
 
             // internal decomposition helper
             Primitive2DReference impCreatePart(
diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
index 722244e463af..fe2d7ff7a9b3 100644
--- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx
@@ -35,9 +35,9 @@ namespace drawinglayer
         class SdrOle2Primitive2D final : public BasePrimitive2D
         {
         private:
-            Primitive2DContainer const                        maOLEContent;
-            basegfx::B2DHomMatrix const                       maTransform;
-            attribute::SdrLineFillShadowTextAttribute const   maSdrLFSTAttribute;
+            Primitive2DContainer                         maOLEContent;
+            basegfx::B2DHomMatrix                       maTransform;
+            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
 
         public:
             SdrOle2Primitive2D(
diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index b2f3f940bec1..2dec9b986c0c 100644
--- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -38,12 +38,12 @@ namespace drawinglayer
         {
         private:
             tools::WeakReference<SdrOle2Obj>            mpSdrOle2Obj;
-            basegfx::B2DHomMatrix const                 maObjectTransform;
+            basegfx::B2DHomMatrix                       maObjectTransform;
 
             // #i104867# The GraphicVersion number to identify in operator== if
             // the graphic has changed, but without fetching it (which may
             // be expensive, e.g. triggering chart creation)
-            sal_uInt32 const                            mnGraphicVersion;
+            sal_uInt32                                  mnGraphicVersion;
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
index 1373c5986cf4..b6944230f18c 100644
--- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx
@@ -36,9 +36,9 @@ namespace drawinglayer
         class SdrPathPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
-            basegfx::B2DHomMatrix const                       maTransform;
-            attribute::SdrLineFillShadowTextAttribute const   maSdrLFSTAttribute;
-            basegfx::B2DPolyPolygon const                     maUnitPolyPolygon;
+            basegfx::B2DHomMatrix                       maTransform;
+            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
+            basegfx::B2DPolyPolygon                     maUnitPolyPolygon;
 
             // OperationSmiley: Added to be able to define a FillGeometry different from local
             // geometry. It is ignored when empty and/or equal to UnitPolyPolygon.
@@ -49,7 +49,7 @@ namespace drawinglayer
             // 'same' is in quotes since it is a UnitPolygon, so being relative to the
             // unit polygon of the local geometry (UnitPolyPolygon). The definition is complete
             // when applying the also given transformation (maTransform)
-            basegfx::B2DPolyPolygon const                     maUnitDefinitionPolyPolygon;
+            basegfx::B2DPolyPolygon                     maUnitDefinitionPolyPolygon;
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index 276bbcdb57c1..e0b561bb7dc1 100644
--- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx
@@ -35,13 +35,13 @@ namespace drawinglayer
         class SdrRectanglePrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
-            basegfx::B2DHomMatrix const                       maTransform;
-            attribute::SdrLineFillShadowTextAttribute const   maSdrLFSTAttribute;
-            double const                                      mfCornerRadiusX;    // [0.0..1.0] relative to 1/2 width
-            double const                                      mfCornerRadiusY;    // [0.0..1.0] relative to 1/2 height
+            basegfx::B2DHomMatrix                       maTransform;
+            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
+            double                                      mfCornerRadiusX;    // [0.0..1.0] relative to 1/2 width
+            double                                      mfCornerRadiusY;    // [0.0..1.0] relative to 1/2 height
 
             // flag which decides if the HitArea should be the filled geometry
-            bool const                                        mbForceFillForHitTest : 1;
+            bool                                        mbForceFillForHitTest : 1;
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index 1edd4377672a..eac15db3b878 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -109,10 +109,10 @@ namespace drawinglayer
         {
         private:
             // unit contour polygon (scaled to [0.0 .. 1.0])
-            basegfx::B2DPolyPolygon const             maUnitPolyPolygon;
+            basegfx::B2DPolyPolygon             maUnitPolyPolygon;
 
             // complete contour polygon transform (scale, rotate, shear, translate)
-            basegfx::B2DHomMatrix const               maObjectTransform;
+            basegfx::B2DHomMatrix               maObjectTransform;
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -149,10 +149,10 @@ namespace drawinglayer
         {
         private:
             // the path to use. Each paragraph will use one Polygon.
-            basegfx::B2DPolyPolygon const             maPathPolyPolygon;
+            basegfx::B2DPolyPolygon             maPathPolyPolygon;
 
             // the Fontwork parameters
-            attribute::SdrFormTextAttribute const     maSdrFormTextAttribute;
+            attribute::SdrFormTextAttribute     maSdrFormTextAttribute;
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -189,16 +189,16 @@ namespace drawinglayer
         {
         private:
             // text range transformation from unit range ([0.0 .. 1.0]) to text range
-            basegfx::B2DHomMatrix const                   maTextRangeTransform;
+            basegfx::B2DHomMatrix                   maTextRangeTransform;
 
             // text alignments
-            SdrTextHorzAdjust const                       maSdrTextHorzAdjust;
-            SdrTextVertAdjust const                       maSdrTextVertAdjust;
+            SdrTextHorzAdjust                       maSdrTextHorzAdjust;
+            SdrTextVertAdjust                       maSdrTextVertAdjust;
 
-            bool const                                    mbFixedCellHeight : 1;
-            bool const                                    mbUnlimitedPage : 1;    // force layout with no text break
-            bool const                                    mbCellText : 1;         // this is a cell text as block text
-            bool const                                    mbWordWrap : 1;         // for CustomShapes text layout
+            bool                                    mbFixedCellHeight : 1;
+            bool                                    mbUnlimitedPage : 1;    // force layout with no text break
+            bool                                    mbCellText : 1;         // this is a cell text as block text
+            bool                                    mbWordWrap : 1;         // for CustomShapes text layout
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -245,9 +245,9 @@ namespace drawinglayer
         {
         private:
             // text range transformation from unit range ([0.0 .. 1.0]) to text range
-            basegfx::B2DHomMatrix const                   maTextRangeTransform;
+            basegfx::B2DHomMatrix                   maTextRangeTransform;
 
-            bool const                                    mbFixedCellHeight : 1;
+            bool                                    mbFixedCellHeight : 1;
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -283,9 +283,9 @@ namespace drawinglayer
         class SdrAutoFitTextPrimitive2D final : public SdrTextPrimitive2D
         {
         private:
-            ::basegfx::B2DHomMatrix const                 maTextRangeTransform;   // text range transformation from unit range ([0.0 .. 1.0]) to text range
+            ::basegfx::B2DHomMatrix                 maTextRangeTransform;   // text range transformation from unit range ([0.0 .. 1.0]) to text range
 
-            bool const                                    mbWordWrap : 1;         // for CustomShapes text layout
+            bool                                    mbWordWrap : 1;         // for CustomShapes text layout
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;
@@ -322,7 +322,7 @@ namespace drawinglayer
         private:
             // XXX: might have position of overflowing text
 
-            ::basegfx::B2DHomMatrix const maTextRangeTransform;   // text range transformation from unit range ([0.0 .. 1.0]) to text range
+            ::basegfx::B2DHomMatrix maTextRangeTransform;   // text range transformation from unit range ([0.0 .. 1.0]) to text range
 
             // local decomposition.
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override;