Revert "loplugin:constfields in slideshow"

This reverts commit 56940b766e5d52cb1c17b4250e4c7e2c375b7b65.

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

36 files changed, 86 insertions, 86 deletions

diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index 9996924880ac..fc5417ffaf8f 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -341,7 +341,7 @@ namespace slideshow::internal
                 ::basegfx::B2DPoint                maShapeOrig;
                 const int                          mnFlags;
                 bool                               mbAnimationStarted;
-                sal_Int16 const                    mnAdditive;
+                sal_Int16                          mnAdditive;
             };
 
 
@@ -617,7 +617,7 @@ namespace slideshow::internal
                 }
 
             private:
-                double const mnScale;
+                double mnScale;
             };
 
             /** Overload for NumberAnimations which need scaling (width,height,x,y currently)
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index ec03c57034cc..c8716706c166 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -79,14 +79,14 @@ private:
 private:
     css::uno::Reference<css::animations::XAnimate>  mxAnimateNode;
     ShapeAttributeLayerHolder                       maAttributeLayerHolder;
-    ::basegfx::B2DVector const                      maSlideSize;
+    ::basegfx::B2DVector                            maSlideSize;
     AnimationActivitySharedPtr                      mpActivity;
 
     /// When valid, this node has a plain target shape
     AttributableShapeSharedPtr                      mpShape;
     /// When valid, this is a subsetted target shape
     ShapeSubsetSharedPtr                            mpShapeSubset;
-    SubsettableShapeManagerSharedPtr const          mpSubsetManager;
+    SubsettableShapeManagerSharedPtr                mpSubsetManager;
     bool                                            mbPreservedVisibility;
     bool                                            mbIsIndependentSubset;
 };
diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx
index e8f933632587..0b4136f34635 100644
--- a/slideshow/source/engine/expressionnodefactory.cxx
+++ b/slideshow/source/engine/expressionnodefactory.cxx
@@ -48,7 +48,7 @@ namespace slideshow::internal
                 }
 
             private:
-                double const  maValue;
+                double  maValue;
             };
 
             class TValueExpression : public ExpressionNode
diff --git a/slideshow/source/engine/opengl/Operation.hxx b/slideshow/source/engine/opengl/Operation.hxx
index f26fd193f16d..0ee818f24574 100644
--- a/slideshow/source/engine/opengl/Operation.hxx
+++ b/slideshow/source/engine/opengl/Operation.hxx
@@ -45,15 +45,15 @@ public:
 protected:
     /** Should this operation be interpolated . If TRUE, the transform will smoothly move from making no difference from t = 0.0 to mnT0 to being completely transformed from t = mnT1 to 1. If FALSE, the transform will be ineffectual from t = 0 to mnT0, and completely transformed from t = mnT0 to 1.
     */
-    bool const mbInterpolate;
+    bool mbInterpolate;
 
     /** time to begin the transformation
     */
-    double const mnT0;
+    double mnT0;
 
     /** time to finish the transformation
     */
-    double const mnT1;
+    double mnT1;
 public:
     /** this is the function that is called to give the Operation to OpenGL.
 
@@ -107,15 +107,15 @@ public:
 private:
     /** axis to rotate CCW about
     */
-    glm::vec3 const axis;
+    glm::vec3 axis;
 
     /** position that rotation axis runs through
     */
-    glm::vec3 const origin;
+    glm::vec3 origin;
 
     /** angle in degrees of CCW rotation
     */
-    double const angle;
+    double angle;
 };
 
 std::shared_ptr<SRotate>
@@ -149,8 +149,8 @@ public:
     */
     SScale(const glm::vec3& Scale, const glm::vec3& Origin,bool bInter, double T0, double T1);
 private:
-    glm::vec3 const scale;
-    glm::vec3 const origin;
+    glm::vec3 scale;
+    glm::vec3 origin;
 };
 
 std::shared_ptr<SScale>
@@ -182,7 +182,7 @@ public:
 private:
     /** vector to translate by
     */
-    glm::vec3 const vector;
+    glm::vec3 vector;
 };
 
 std::shared_ptr<STranslate>
@@ -234,10 +234,10 @@ public:
 
     RotateAndScaleDepthByWidth(const glm::vec3& Axis,const glm::vec3& Origin,double Angle, bool bScale, bool bInter, double T0, double T1);
 private:
-    glm::vec3 const axis;
-    glm::vec3 const origin;
-    double const angle;
-    bool const scale;
+    glm::vec3 axis;
+    glm::vec3 origin;
+    double angle;
+    bool scale;
 };
 
 std::shared_ptr<RotateAndScaleDepthByWidth>
@@ -252,10 +252,10 @@ public:
 
     RotateAndScaleDepthByHeight(const glm::vec3& Axis,const glm::vec3& Origin,double Angle, bool bScale, bool bInter, double T0, double T1);
 private:
-    glm::vec3 const axis;
-    glm::vec3 const origin;
-    double const angle;
-    bool const scale;
+    glm::vec3 axis;
+    glm::vec3 origin;
+    double angle;
+    bool scale;
 };
 
 std::shared_ptr<RotateAndScaleDepthByHeight>
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index cadf4c7dece2..7403cad87425 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -105,9 +105,9 @@ private:
 
 struct OGLFormat
 {
-    GLint const  nInternalFormat;
-    GLenum const eFormat;
-    GLenum const eType;
+    GLint  nInternalFormat;
+    GLenum eFormat;
+    GLenum eType;
 };
 
 /* channel ordering: (0:rgba, 1:bgra, 2:argb, 3:abgr)
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 595cc19086b9..1aedef9b9254 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -100,7 +100,7 @@ public:
 private:
     ::canvas::tools::ElapsedTime    maTimer;
     double                          mnNextTime;
-    std::weak_ptr<Activity> const   mpActivity;
+    std::weak_ptr<Activity>         mpActivity;
     ActivitiesQueue&                mrActivityQueue;
 };
 
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 9d61fb383e42..371f7058d1d6 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -52,13 +52,13 @@ namespace {
 
 class ScrollTextAnimNode
 {
-    sal_uInt32 const  mnDuration; // single duration
-    sal_uInt32 const  mnRepeat; // 0 -> endless
-    double const      mfStart;
-    double const      mfStop;
-    sal_uInt32 const  mnFrequency; // in ms
+    sal_uInt32  mnDuration; // single duration
+    sal_uInt32  mnRepeat; // 0 -> endless
+    double      mfStart;
+    double      mfStop;
+    sal_uInt32  mnFrequency; // in ms
     // forth and back change at mnRepeat%2:
-    bool const        mbAlternate;
+    bool        mbAlternate;
 
 public:
     ScrollTextAnimNode(
@@ -181,7 +181,7 @@ private:
     DrawShapeSharedPtr                          mpDrawShape;
     ShapeAttributeLayerHolder                   maShapeAttrLayer;
     GDIMetaFileSharedPtr                        mpMetaFile;
-    IntrinsicAnimationEventHandlerSharedPtr const mpListener;
+    IntrinsicAnimationEventHandlerSharedPtr     mpListener;
     canvas::tools::ElapsedTime                  maTimer;
     double                                      mfRotationAngle;
     bool                                        mbIsShapeAnimated;
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 05cc539c1cd0..fac2e2b573ce 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -642,7 +642,7 @@ namespace slideshow::internal
                 }
 
             private:
-                DrawShapeSubsetting::IndexClassificator const meClass;
+                DrawShapeSubsetting::IndexClassificator meClass;
                 sal_Int32                               mnCurrCount;
             };
         }
@@ -717,10 +717,10 @@ namespace slideshow::internal
                 }
 
             private:
-                sal_Int32 const                                                 mnNodeIndex;
+                sal_Int32                                                       mnNodeIndex;
                 DrawShapeSubsetting::IndexClassificatorVector::const_iterator&  mrLastBegin;
                 DrawShapeSubsetting::IndexClassificatorVector::const_iterator&  mrLastEnd;
-                DrawShapeSubsetting::IndexClassificator const                   meClass;
+                DrawShapeSubsetting::IndexClassificator                         meClass;
             };
 
             DocTreeNode makeTreeNode( const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rBegin,
diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx
index f539d554e064..6b455e387f07 100644
--- a/slideshow/source/engine/shapes/externalshapebase.hxx
+++ b/slideshow/source/engine/shapes/externalshapebase.hxx
@@ -122,7 +122,7 @@ namespace slideshow
 
             // The attributes of this Shape
             const double                                                            mnPriority;
-            ::basegfx::B2DRectangle const                                           maBounds;
+            ::basegfx::B2DRectangle                                                 maBounds;
         };
     }
 }
diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx
index c0c64e5f4efc..d63a60f7a74e 100644
--- a/slideshow/source/engine/shapes/gdimtftools.hxx
+++ b/slideshow/source/engine/shapes/gdimtftools.hxx
@@ -73,8 +73,8 @@ namespace slideshow
                 return mnDuration;
             }
 
-            GDIMetaFileSharedPtr const    mpMtf;
-            double const                  mnDuration;
+            GDIMetaFileSharedPtr    mpMtf;
+            double                  mnDuration;
         };
 
         typedef ::std::vector< MtfAnimationFrame > VectorOfMtfAnimationFrames;
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index a8a46f7ba050..ed288f4861bf 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -80,10 +80,10 @@ namespace slideshow::internal
             SlideShowContext                        maContext;
             std::weak_ptr<DrawShape>              mpDrawShape;
             WakeupEventSharedPtr                    mpWakeupEvent;
-            IntrinsicAnimationEventHandlerSharedPtr const mpListener;
+            IntrinsicAnimationEventHandlerSharedPtr mpListener;
             ::std::vector<double>                   maTimeouts;
             ::std::size_t                           mnCurrIndex;
-            ::std::size_t const                     mnNumLoops;
+            ::std::size_t                           mnNumLoops;
             ::std::size_t                           mnLoopCount;
             bool                                    mbIsActive;
         };
diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx
index 66336148c87b..102b8de8e70f 100644
--- a/slideshow/source/engine/shapes/viewappletshape.hxx
+++ b/slideshow/source/engine/shapes/viewappletshape.hxx
@@ -140,7 +140,7 @@ namespace slideshow
 
         private:
 
-            ViewLayerSharedPtr const                 mpViewLayer;
+            ViewLayerSharedPtr                                    mpViewLayer;
 
             /// the actual viewer component for this applet
             css::uno::Reference<
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx
index f9da137e2f47..2bdf4b49e3aa 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx
@@ -75,7 +75,7 @@ namespace slideshow
 
             /** The view layer this object is part of.
              */
-            ViewLayerSharedPtr const                            mpViewLayer;
+            ViewLayerSharedPtr                                  mpViewLayer;
 
             /// Generated content bitmap, already with correct output size
             mutable css::uno::Reference< css::rendering::XBitmap >  mxBitmap;
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx
index f1bd23644823..cc5386346448 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -147,7 +147,7 @@ namespace slideshow
             void implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds,
                                              const css::uno::Sequence< css::uno::Any >& rVCLDeviceParams,
                                              const OUString& rMimeType );
-            ViewLayerSharedPtr const              mpViewLayer;
+            ViewLayerSharedPtr                    mpViewLayer;
             VclPtr< SystemChildWindow >           mpMediaWindow;
             mutable css::awt::Point               maWindowOffset;
             mutable ::basegfx::B2DRectangle       maBounds;
diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx
index 2dc4255aafe5..a59dc0f2a2a7 100644
--- a/slideshow/source/engine/shapes/viewshape.hxx
+++ b/slideshow/source/engine/shapes/viewshape.hxx
@@ -297,7 +297,7 @@ namespace slideshow
 
                 Needed for sprite creation
             */
-            ViewLayerSharedPtr const                    mpViewLayer;
+            ViewLayerSharedPtr                          mpViewLayer;
 
             /// A set of cached mtf/canvas combinations
             mutable RendererCacheVector                 maRenderers;
diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx
index a3115622955e..2d1b04bb1808 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -251,7 +251,7 @@ namespace slideshow
             basegfx::B2DRange          maBounds;
             basegfx::B2DRange          maNewBounds;
             bool                       mbBoundsDirty;     // true, if view layers need resize
-            bool const                 mbBackgroundLayer; // true, if this
+            bool                       mbBackgroundLayer; // true, if this
                                                           // layer is the
                                                           // special
                                                           // background layer
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index e7890641da4f..2ec37ee2c6ff 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -602,7 +602,7 @@ namespace slideshow::internal
                 }
 
             private:
-                ::cppcanvas::CanvasSharedPtr const mpCanvas;
+                ::cppcanvas::CanvasSharedPtr mpCanvas;
             };
         }
 
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index 4ad046c3a122..0f2844ced967 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -345,7 +345,7 @@ namespace slideshow
                 is, no extra layers are created, and the slideshow runs
                 potentially faster.
              */
-            bool const               mbDisableAnimationZOrder;
+            bool                     mbDisableAnimationZOrder;
         };
 
         typedef ::std::shared_ptr< LayerManager > LayerManagerSharedPtr;
diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx
index bcb958f36f9f..6d69d9593417 100644
--- a/slideshow/source/engine/slide/slideanimations.hxx
+++ b/slideshow/source/engine/slide/slideanimations.hxx
@@ -100,7 +100,7 @@ namespace slideshow
             void end();
 
         private:
-            SlideShowContext const   maContext;
+            SlideShowContext         maContext;
             const basegfx::B2DVector maSlideSize;
             AnimationNodeSharedPtr   mpRootNode;
         };
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 3a1039a004ed..0805d084e9fa 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -218,7 +218,7 @@ private:
     sal_Int16                                           mnCurrentCursor;
 
     /// True, when intrinsic shape animations are allowed
-    bool const                                          mbIntrinsicAnimationsAllowed;
+    bool                                                mbIntrinsicAnimationsAllowed;
 
     /// True, when user paint overlay is enabled
     bool                                                mbUserPaintOverlayEnabled;
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 89ef8c835a83..7a70b8b63352 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -309,10 +309,10 @@ namespace slideshow::internal
         private:
             XShapeHash&                         mrShapeHash;
             uno::Reference< drawing::XShape >   mxTargetShape;
-            sal_Int16 const                     mnParagraphIndex;
+            sal_Int16                           mnParagraphIndex;
 
             // get initial or final state
-            bool const                          mbInitial;
+            bool                                mbInitial;
         };
     }
 
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 7125f5191895..f9b5e6ba8032 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -129,7 +129,7 @@ private:
         one used by SlideShowImpl: it is not paused or modified by
         animations.
     */
-    canvas::tools::ElapsedTime const maTimer;
+    canvas::tools::ElapsedTime maTimer;
     /** Time between the display of frames.  Enforced only when mbIsActive
         is <TRUE/>.
     */
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index a398fee0627a..3576393751ed 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -502,7 +502,7 @@ namespace slideshow::internal
                 }
 
             private:
-                ParserContextSharedPtr const  mpParserContext; // might get modified during parsing
+                ParserContextSharedPtr  mpParserContext; // might get modified during parsing
             };
 
             const ParserContextSharedPtr& getParserContext()
diff --git a/slideshow/source/engine/transitions/combtransition.hxx b/slideshow/source/engine/transitions/combtransition.hxx
index 082e673135b9..37b288ae67fd 100644
--- a/slideshow/source/engine/transitions/combtransition.hxx
+++ b/slideshow/source/engine/transitions/combtransition.hxx
@@ -52,7 +52,7 @@ public:
 
 private:
     const ::basegfx::B2DVector maPushDirectionUnit;
-    sal_Int32 const            mnNumStripes;
+    sal_Int32                  mnNumStripes;
 
     void renderComb( double t, const ViewEntry& rViewEntry ) const;
 };
diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx
index 88463ec6250f..9a86469a5d06 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.hxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.hxx
@@ -33,7 +33,7 @@ public:
     explicit EllipseWipe( sal_Int32 nSubType ): mnSubType( nSubType ) {}
     virtual ::basegfx::B2DPolyPolygon operator () ( double x ) override;
 private:
-    sal_Int32 const mnSubType;
+    sal_Int32 mnSubType;
 };
 
 }
diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx
index f4654548f26e..1a353a64fb83 100644
--- a/slideshow/source/engine/transitions/pinwheelwipe.hxx
+++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx
@@ -33,7 +33,7 @@ public:
     explicit PinWheelWipe( sal_Int32 blades ) : m_blades(blades) {}
     virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override;
 private:
-    sal_Int32 const m_blades;
+    sal_Int32 m_blades;
 };
 
 }
diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx
index 8af80f5f715a..b6df2bb8fde9 100644
--- a/slideshow/source/engine/transitions/randomwipe.hxx
+++ b/slideshow/source/engine/transitions/randomwipe.hxx
@@ -39,7 +39,7 @@ public:
     virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override;
 private:
     ::std::unique_ptr< ::basegfx::B2DPoint []> m_positions;
-    sal_Int32 const m_nElements;
+    sal_Int32 m_nElements;
     ::basegfx::B2DPolygon m_rect;
 };
 
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index e28aa070d46c..6594d310bb40 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -245,8 +245,8 @@ private:
     // bool
     bool mbSuccess;
 
-    sal_Int16 const mnTransitionType;
-    sal_Int16 const mnTransitionSubType;
+    sal_Int16 mnTransitionType;
+    sal_Int16 mnTransitionSubType;
 
     uno::Reference<presentation::XTransitionFactory> mxFactory;
 };
@@ -462,7 +462,7 @@ public:
         double                                     t ) override;
 
 private:
-    RGBColor const maFadeColor;
+    RGBColor maFadeColor;
 };
 
 void CutSlideChange::prepareForRun(
diff --git a/slideshow/source/engine/transitions/waterfallwipe.hxx b/slideshow/source/engine/transitions/waterfallwipe.hxx
index 6d9957beb1e3..6f397058cd43 100644
--- a/slideshow/source/engine/transitions/waterfallwipe.hxx
+++ b/slideshow/source/engine/transitions/waterfallwipe.hxx
@@ -34,7 +34,7 @@ public:
     WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis );
     virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override;
 private:
-    bool const m_flipOnYAxis;
+    bool m_flipOnYAxis;
     ::basegfx::B2DPolygon m_waterfall;
 };
 
diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx
index ce4a1d3ee0b7..19ef963bbdc3 100644
--- a/slideshow/source/inc/activitiesfactory.hxx
+++ b/slideshow/source/inc/activitiesfactory.hxx
@@ -90,7 +90,7 @@ namespace ActivitiesFactory
             (wouldn't have a clue, then, how to scale the
             animation over time).
         */
-        double const                                    mnMinDuration;
+        double                                          mnMinDuration;
 
         /** Minimal number of frames for this activity.
 
@@ -100,7 +100,7 @@ namespace ActivitiesFactory
             is over, the activity will be prolonged until
             mnMinNumberOfFrames are rendered.
         */
-        sal_uInt32 const                                mnMinNumberOfFrames;
+        sal_uInt32                                      mnMinNumberOfFrames;
 
         /** Number of repeats for the simple duration
 
@@ -113,10 +113,10 @@ namespace ActivitiesFactory
         ::std::optional<double> const                 maRepeats;
 
         /// Fraction of simple time to accelerate animation
-        double const                                    mnAcceleration;
+        double                                          mnAcceleration;
 
         /// Fraction of simple time to decelerate animation
-        double const                                    mnDeceleration;
+        double                                          mnDeceleration;
 
         /// Shape, to get bounds from
         ShapeSharedPtr                                  mpShape;
@@ -125,7 +125,7 @@ namespace ActivitiesFactory
         ::basegfx::B2DVector                            maSlideBounds;
 
         /// When true, activity is played reversed after mnDuration.
-        bool const                                      mbAutoReverse;
+        bool                                            mbAutoReverse;
     };
 
     /** Create an activity from an XAnimate node.
diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx
index c76b06b73bd1..80fcc07a6789 100644
--- a/slideshow/source/inc/animatedsprite.hxx
+++ b/slideshow/source/inc/animatedsprite.hxx
@@ -137,13 +137,13 @@ namespace slideshow
             void transform( const ::basegfx::B2DHomMatrix& rTransform );
 
         private:
-            ViewLayerSharedPtr const                                    mpViewLayer;
+            ViewLayerSharedPtr                                          mpViewLayer;
 
             ::cppcanvas::CustomSpriteSharedPtr                          mpSprite;
             ::basegfx::B2DSize                                          maEffectiveSpriteSizePixel;
             ::basegfx::B2DSize                                          maContentPixelOffset;
 
-            double const                                                mnSpritePrio;
+            double                                                      mnSpritePrio;
             double                                                      mnAlpha;
             ::std::optional< ::basegfx::B2DPoint >                    maPosPixel;
             ::std::optional< ::basegfx::B2DPolyPolygon >              maClip;
diff --git a/slideshow/source/inc/basenode.hxx b/slideshow/source/inc/basenode.hxx
index 7bbf0c13b6a8..27545dc877e0 100644
--- a/slideshow/source/inc/basenode.hxx
+++ b/slideshow/source/inc/basenode.hxx
@@ -53,10 +53,10 @@ struct NodeContext
         {}
 
     /// Context as passed to createAnimationNode()
-    SlideShowContext const           maContext;
+    SlideShowContext                 maContext;
 
     /// Size in user coordinate space of the corresponding slide
-    ::basegfx::B2DVector const       maSlideSize;
+    ::basegfx::B2DVector             maSlideSize;
 
     /// Shape to be used (provided by parent, e.g. for iterations)
     ShapeSubsetSharedPtr             mpMasterShapeSubset;
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index ee2ae17dfb15..388c1db648e1 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -79,7 +79,7 @@ namespace slideshow
 
         private:
             EventSharedPtr  mpEvent;
-            double const    mnTimeout;
+            double          mnTimeout;
         };
 
         /// Return value for makeInterruptableDelay()
diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx
index eaa7f0876790..a12fa9618271 100644
--- a/slideshow/source/inc/shapeimporter.hxx
+++ b/slideshow/source/inc/shapeimporter.hxx
@@ -132,7 +132,7 @@ private:
     PolyPolygonVector                         maPolygons;
     ::std::stack<XShapesEntry>                maShapesStack;
     double                                    mnAscendingPrio;
-    bool const                                mbConvertingMasterPage;
+    bool                                      mbConvertingMasterPage;
 };
 
 } // namespace internal
diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx
index 18aaaacfb560..750fc0f353b2 100644
--- a/slideshow/source/inc/shapesubset.hxx
+++ b/slideshow/source/inc/shapesubset.hxx
@@ -134,9 +134,9 @@ namespace slideshow
             //ShapeSubset(const ShapeSubset&);
             //ShapeSubset& operator=( const ShapeSubset& );
 
-            AttributableShapeSharedPtr const mpOriginalShape;
+            AttributableShapeSharedPtr       mpOriginalShape;
             AttributableShapeSharedPtr       mpSubsetShape;
-            DocTreeNode const                maTreeNode;
+            DocTreeNode                      maTreeNode;
             SubsettableShapeManagerSharedPtr mpShapeManager;
         };
     }
diff --git a/slideshow/source/inc/transitioninfo.hxx b/slideshow/source/inc/transitioninfo.hxx
index cf3529476b26..241771bec5f9 100644
--- a/slideshow/source/inc/transitioninfo.hxx
+++ b/slideshow/source/inc/transitioninfo.hxx
@@ -33,8 +33,8 @@ struct TransitionInfo
 
     // {
 
-    sal_Int16 const       mnTransitionType;
-    sal_Int16 const       mnTransitionSubType;
+    sal_Int16       mnTransitionType;
+    sal_Int16       mnTransitionSubType;
 
     // }
 
@@ -54,16 +54,16 @@ struct TransitionInfo
     };
 
     /// class of effect handling
-    TransitionClass const meTransitionClass;
+    TransitionClass meTransitionClass;
 
     /// Rotation angle of clip polygon
-    double const          mnRotationAngle;
+    double          mnRotationAngle;
 
     /// X scaling of clip polygon (negative values mirror)
-    double const          mnScaleX;
+    double          mnScaleX;
 
     /// Y scaling of clip polygon (negative values mirror)
-    double const          mnScaleY;
+    double          mnScaleY;
 
     /** This enum determines the method how to reverse
         a parametric clip polygon transition.
@@ -102,7 +102,7 @@ struct TransitionInfo
 
         @see ReverseMethod
     */
-    ReverseMethod const   meReverseMethod;
+    ReverseMethod   meReverseMethod;
 
     /** When true, transition 'out' effects are realized
         by inverting the parameter sweep direction (1->0
@@ -110,20 +110,20 @@ struct TransitionInfo
         realized by changing inside and outside areas of
         the parametric poly-polygon.
     */
-    bool const            mbOutInvertsSweep;
+    bool            mbOutInvertsSweep;
 
     /** when true, scale clip polygon isotropically to
         target size.  when false, scale is
         anisotropically.
     */
-    bool const            mbScaleIsotrophically;
+    bool            mbScaleIsotrophically;
 
 
     /// Compare against type and subtype
     class Comparator
     {
-        sal_Int16 const mnTransitionType;
-        sal_Int16 const mnTransitionSubType;
+        sal_Int16 mnTransitionType;
+        sal_Int16 mnTransitionSubType;
     public:
         Comparator( sal_Int16 nTransitionType,
                     sal_Int16 nTransitionSubType )