compact namespace: slideshow

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

67 files changed, 123 insertions, 252 deletions

diff --git a/slideshow/source/engine/activities/accumulation.hxx b/slideshow/source/engine/activities/accumulation.hxx
index 02a19815af1b..ec04195597af 100644
--- a/slideshow/source/engine/activities/accumulation.hxx
+++ b/slideshow/source/engine/activities/accumulation.hxx
@@ -24,9 +24,7 @@
 #include <rtl/ustring.hxx>
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** Generic accumulation.
 
@@ -78,7 +76,7 @@ namespace slideshow
             // cumulative behaviour for bools.
             return bCurrValue;
         }
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACCUMULATION_HXX
diff --git a/slideshow/source/engine/activities/activitybase.hxx b/slideshow/source/engine/activities/activitybase.hxx
index fdf492aca9ef..e76c84d8e6c5 100644
--- a/slideshow/source/engine/activities/activitybase.hxx
+++ b/slideshow/source/engine/activities/activitybase.hxx
@@ -25,8 +25,7 @@
 #include <animatableshape.hxx>
 #include <shapeattributelayer.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Base class for animation activities.
 
@@ -137,8 +136,7 @@ private:
     bool                            mbIsActive;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACTIVITYBASE_HXX
 
diff --git a/slideshow/source/engine/activities/activityparameters.hxx b/slideshow/source/engine/activities/activityparameters.hxx
index a8835a4cce21..9df762838530 100644
--- a/slideshow/source/engine/activities/activityparameters.hxx
+++ b/slideshow/source/engine/activities/activityparameters.hxx
@@ -28,8 +28,7 @@
 #include <optional>
 #include <vector>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Parameter struct for animation activities
 
@@ -128,8 +127,7 @@ struct ActivityParameters
     const bool                                  mbAutoReverse;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACTIVITYPARAMETERS_HXX
 
diff --git a/slideshow/source/engine/activities/continuousactivitybase.hxx b/slideshow/source/engine/activities/continuousactivitybase.hxx
index 1aeea9d173b2..8fd19d421e0c 100644
--- a/slideshow/source/engine/activities/continuousactivitybase.hxx
+++ b/slideshow/source/engine/activities/continuousactivitybase.hxx
@@ -22,9 +22,7 @@
 
 #include "simplecontinuousactivitybase.hxx"
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** Simple, continuous animation.
 
@@ -59,7 +57,7 @@ namespace slideshow
             virtual void simplePerform( double      nSimpleTime,
                                         sal_uInt32  nRepeatCount ) const override;
         };
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_CONTINUOUSACTIVITYBASE_HXX
diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
index 5b9f66278be4..2238db22852c 100644
--- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
+++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
@@ -25,9 +25,7 @@
 #include <basegfx/utils/keystoplerp.hxx>
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** Interpolated, key-times animation.
 
@@ -68,7 +66,7 @@ namespace slideshow
         private:
             const ::basegfx::utils::KeyStopLerp maLerper;
         };
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_CONTINUOUSKEYTIMEACTIVITYBASE_HXX
diff --git a/slideshow/source/engine/activities/discreteactivitybase.hxx b/slideshow/source/engine/activities/discreteactivitybase.hxx
index 205f9e9e4193..1332ad3c5539 100644
--- a/slideshow/source/engine/activities/discreteactivitybase.hxx
+++ b/slideshow/source/engine/activities/discreteactivitybase.hxx
@@ -26,9 +26,7 @@
 #include <vector>
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** Specialization of ActivityBase for discrete time activities.
 
@@ -73,7 +71,7 @@ namespace slideshow
             const double                    mnSimpleDuration;
             sal_uInt32                      mnCurrPerformCalls;
         };
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_DISCRETEACTIVITYBASE_HXX
diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
index b59b8b7031f2..fb4f746054db 100644
--- a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
+++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
@@ -23,9 +23,7 @@
 #include "activitybase.hxx"
 #include <canvas/elapsedtime.hxx>
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** Simple, continuous animation.
 
@@ -73,7 +71,7 @@ namespace slideshow
             /// Actual number of frames shown until now.
             sal_uInt32                      mnCurrPerformCalls;
         };
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_SIMPLECONTINUOUSACTIVITYBASE_HXX
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx
index d1c08601cf20..dd308f04fd9d 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.hxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx
@@ -24,8 +24,7 @@
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <com/sun/star/animations/XAudio.hpp>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Audio node.
 
@@ -62,8 +61,7 @@ private:
     void checkPlayingStatus();
 };
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONAUDIONODE_HXX
 
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index c8716706c166..d31a3a5a2fc9 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -27,8 +27,7 @@
 #include <attributableshape.hxx>
 #include <shapesubset.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Common base class for all leaf animation nodes.
 
@@ -91,8 +90,7 @@ private:
     bool                                            mbIsIndependentSubset;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONBASENODE_HXX
 
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx b/slideshow/source/engine/animationnodes/animationcolornode.hxx
index 6ae5f848c849..8d5d4289811d 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx
@@ -23,8 +23,7 @@
 #include "animationbasenode.hxx"
 #include <com/sun/star/animations/XAnimateColor.hpp>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class AnimationColorNode : public AnimationBaseNode
 {
@@ -46,8 +45,7 @@ private:
     css::uno::Reference<css::animations::XAnimateColor > mxColorNode;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOLORNODE_HXX
 
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
index 09dcf9eb1df0..bcb61f1ddd3f 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -24,8 +24,7 @@
 #include <iexternalmediashapebase.hxx>
 #include <com/sun/star/animations/XCommand.hpp>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Command node.
 
@@ -52,8 +51,7 @@ private:
     css::uno::Reference<css::animations::XCommand > mxCommandNode;
 };
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOMMANDNODE_HXX
 
diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
index a6a37a5b7728..8bd91e158ca2 100644
--- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
@@ -22,8 +22,7 @@
 #include "animationbasenode.hxx"
 #include <com/sun/star/animations/XAnimateMotion.hpp>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class AnimationPathMotionNode : public AnimationBaseNode
 {
@@ -49,8 +48,7 @@ private:
     css::uno::Reference<css::animations::XAnimateMotion >  mxPathMotionNode;
 };
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONPATHMOTIONNODE_HXX
 
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx b/slideshow/source/engine/animationnodes/animationsetnode.hxx
index 9c39377470b1..0c16255604cc 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx
@@ -21,8 +21,7 @@
 
 #include "animationbasenode.hxx"
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class AnimationSetNode : public AnimationBaseNode
 {
@@ -41,8 +40,7 @@ private:
     virtual AnimationActivitySharedPtr createActivity() const override;
 };
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONSETNODE_HXX
 
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
index b664fcb3213b..1eafe2dc9148 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
@@ -23,8 +23,7 @@
 #include "animationbasenode.hxx"
 #include <com/sun/star/animations/XAnimateTransform.hpp>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class AnimationTransformNode : public AnimationBaseNode
 {
@@ -50,8 +49,7 @@ private:
     css::uno::Reference<css::animations::XAnimateTransform >   mxTransformNode;
 };
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONTRANSFORMNODE_HXX
 
diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
index 6790e9d2273a..181899557529 100644
--- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
@@ -23,8 +23,7 @@
 #include "animationbasenode.hxx"
 #include <com/sun/star/animations/XTransitionFilter.hpp>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class AnimationTransitionFilterNode : public AnimationBaseNode
 {
@@ -51,8 +50,7 @@ private:
     css::uno::Reference<css::animations::XTransitionFilter> mxTransitionFilterNode;
 };
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONTRANSITIONFILTERNODE_HXX
 
diff --git a/slideshow/source/engine/animationnodes/generateevent.hxx b/slideshow/source/engine/animationnodes/generateevent.hxx
index 4879896551fc..bf7ac99c1298 100644
--- a/slideshow/source/engine/animationnodes/generateevent.hxx
+++ b/slideshow/source/engine/animationnodes/generateevent.hxx
@@ -24,8 +24,7 @@
 #include <delayevent.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Create an event for the given description, calling the given functor.
 
@@ -47,8 +46,7 @@ EventSharedPtr generateEvent(
     SlideShowContext const& rContext,
     double nAdditionalDelay );
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_GENERATEEVENT_HXX
 
diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx
index f68f9dbddae5..63ddef786c74 100644
--- a/slideshow/source/engine/animationnodes/nodetools.hxx
+++ b/slideshow/source/engine/animationnodes/nodetools.hxx
@@ -33,9 +33,7 @@
 # define DEBUG_NODES_SHOWTREE(a)
 #endif
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
 
         // Tools
@@ -63,7 +61,6 @@ namespace slideshow
         */
         bool isIndefiniteTiming( const css::uno::Any& rAny );
 
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_NODETOOLS_HXX
diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
index af3c6e1a9149..62daf26395cb 100644
--- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
@@ -21,8 +21,7 @@
 
 #include <basecontainernode.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** This class implements parallel node containers
 
@@ -47,8 +46,7 @@ private:
     virtual void notifyDeactivating( AnimationNodeSharedPtr const& pChildNode ) override;
 };
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_PARALLELTIMECONTAINER_HXX
 
diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
index 037fea61e97e..015a0041345f 100644
--- a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
+++ b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
@@ -21,8 +21,7 @@
 
 #include "animationbasenode.hxx"
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class PropertyAnimationNode : public AnimationBaseNode
 {
@@ -42,8 +41,7 @@ private:
     virtual AnimationActivitySharedPtr createActivity() const override;
 };
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_PROPERTYANIMATIONNODE_HXX
 
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index ad9dbb40132e..bc277c951a1a 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -21,8 +21,7 @@
 
 #include <basecontainernode.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** This class implements sequential node containers
 
@@ -57,8 +56,7 @@ private:
     EventSharedPtr mpCurrentSkipEvent;
 };
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_SEQUENTIALTIMECONTAINER_HXX
 
diff --git a/slideshow/source/engine/animationnodes/setactivity.hxx b/slideshow/source/engine/animationnodes/setactivity.hxx
index 37e3ff3a53b4..b3585af2e9b8 100644
--- a/slideshow/source/engine/animationnodes/setactivity.hxx
+++ b/slideshow/source/engine/animationnodes/setactivity.hxx
@@ -26,8 +26,7 @@
 #include <shapeattributelayer.hxx>
 #include <activitiesfactory.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Templated setter for animation values
 
@@ -136,8 +135,7 @@ template <class AnimationT> AnimationActivitySharedPtr makeSetActivity(
     return std::make_shared<SetActivity<AnimationT>>(rParms,rAnimation,rToValue);
 }
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_SETACTIVITY_HXX
 
diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx
index c2ebe61d285b..b28ddcf09928 100644
--- a/slideshow/source/engine/pointersymbol.hxx
+++ b/slideshow/source/engine/pointersymbol.hxx
@@ -26,8 +26,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class EventMultiplexer;
 typedef std::shared_ptr<class PointerSymbol> PointerSymbolSharedPtr;
@@ -71,8 +70,7 @@ private:
     bool                                          mbVisible;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif
 
diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx
index 630f9c48fe61..784ebfb2f584 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.hxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.hxx
@@ -41,8 +41,7 @@ namespace basegfx
     class B2DRange;
 }
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 struct SlideShowContext;
 class EventMultiplexer;
@@ -135,8 +134,7 @@ private:
     bool                            mbDrawPressed;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_REHEARSETIMINGSACTIVITY_HXX
 
diff --git a/slideshow/source/engine/shapes/appletshape.hxx b/slideshow/source/engine/shapes/appletshape.hxx
index 49bc81f822fa..0de63af2c484 100644
--- a/slideshow/source/engine/shapes/appletshape.hxx
+++ b/slideshow/source/engine/shapes/appletshape.hxx
@@ -25,10 +25,8 @@
 
 namespace com::sun::star::drawing { class XShape; }
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         struct SlideShowContext;
         class Shape;
 
@@ -39,7 +37,6 @@ namespace slideshow
             const char**                            pPropCopyTable,
             std::size_t                             nNumPropEntries,
             const SlideShowContext&                 rContext );
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_APPLETSHAPE_HXX
diff --git a/slideshow/source/engine/shapes/backgroundshape.hxx b/slideshow/source/engine/shapes/backgroundshape.hxx
index 988dba08a22a..3e709249841f 100644
--- a/slideshow/source/engine/shapes/backgroundshape.hxx
+++ b/slideshow/source/engine/shapes/backgroundshape.hxx
@@ -26,9 +26,7 @@
 
 namespace com::sun::star::drawing { class XDrawPage; }
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         class  Shape;
         struct SlideShowContext;
@@ -45,7 +43,7 @@ namespace slideshow
             const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage,
             const css::uno::Reference< css::drawing::XDrawPage >& xMasterPage,
             const SlideShowContext&                       rContext ); // throw ShapeLoadFailedException;
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_BACKGROUNDSHAPE_HXX
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.hxx b/slideshow/source/engine/shapes/drawinglayeranimation.hxx
index 523108e3ebb7..5a143b087de1 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.hxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.hxx
@@ -22,8 +22,7 @@
 #include <sal/config.h>
 #include <memory>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class Activity;
 struct SlideShowContext;
@@ -33,8 +32,7 @@ std::shared_ptr<Activity> createDrawingLayerAnimActivity(
     SlideShowContext const&                 rContext,
     std::shared_ptr<DrawShape> const&     pDrawShape );
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // ! defined INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWINGLAYERANIMATION_HXX
 
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx
index e4def440fe3d..eb9030affde0 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -35,9 +35,7 @@
 
 class Graphic;
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         class  Activity;
         struct SlideShowContext;
@@ -352,7 +350,7 @@ namespace slideshow
             bool                                                                    mbDrawingLayerAnim;
 
         };
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWSHAPE_HXX
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx
index f9ea3f4d5981..fe0347774348 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx
@@ -27,9 +27,7 @@
 class GDIMetaFile;
 typedef ::std::shared_ptr< GDIMetaFile > GDIMetaFileSharedPtr;
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** This class encapsulates the subsetting aspects of a
             DrawShape.
@@ -239,7 +237,6 @@ namespace slideshow
             mutable bool                        mbNodeTreeInitialized;
         };
 
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWSHAPESUBSETTING_HXX
diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx
index 6b455e387f07..260d8630e170 100644
--- a/slideshow/source/engine/shapes/externalshapebase.hxx
+++ b/slideshow/source/engine/shapes/externalshapebase.hxx
@@ -25,9 +25,7 @@
 #include <slideshowcontext.hxx>
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** Base class for shapes rendered by external engines.
 
@@ -124,7 +122,6 @@ namespace slideshow
             const double                                                            mnPriority;
             ::basegfx::B2DRectangle                                                 maBounds;
         };
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_EXTERNALSHAPEBASE_HXX
diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx
index d63a60f7a74e..7812301f97e6 100644
--- a/slideshow/source/engine/shapes/gdimtftools.hxx
+++ b/slideshow/source/engine/shapes/gdimtftools.hxx
@@ -36,9 +36,7 @@ class GDIMetaFile;
 class Graphic;
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /// meta file loading specialities:
         enum mtf_load_flags {
@@ -124,7 +122,6 @@ namespace slideshow
         bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle&       o_rScrollRect,
                                          ::basegfx::B2DRectangle&       o_rPaintRect,
                                          const GDIMetaFileSharedPtr&    rMtf );
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_GDIMTFTOOLS_HXX
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
index aeef925a3c7a..e5306b671788 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
@@ -27,9 +27,7 @@
 
 /* Definition of IntrinsicAnimationActivity class */
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** Create an IntrinsicAnimationActivity.
 
@@ -60,7 +58,7 @@ namespace slideshow
             const WakeupEventSharedPtr&     rWakeupEvent,
             const ::std::vector<double>&    rTimeouts,
             sal_uInt32                      nNumLoops);
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_INTRINSICANIMATIONACTIVITY_HXX
diff --git a/slideshow/source/engine/shapes/mediashape.hxx b/slideshow/source/engine/shapes/mediashape.hxx
index 44667cd21018..4b2a542eeab2 100644
--- a/slideshow/source/engine/shapes/mediashape.hxx
+++ b/slideshow/source/engine/shapes/mediashape.hxx
@@ -26,10 +26,8 @@
 
 namespace com::sun::star::drawing { class XShape; }
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         struct SlideShowContext;
         class  Shape;
         typedef ::std::shared_ptr< Shape > ShapeSharedPtr;
@@ -38,7 +36,7 @@ namespace slideshow
             const css::uno::Reference<css::drawing::XShape >& xShape,
             double                                     nPrio,
             const SlideShowContext&                    rContext);
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_MEDIASHAPE_HXX
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx
index 2bdf4b49e3aa..0f5b296465aa 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx
@@ -32,9 +32,7 @@
 #include <viewlayer.hxx>
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** This class is the viewable representation of a draw
             document's background, associated to a specific View
@@ -91,7 +89,6 @@ namespace slideshow
 
         typedef ::std::shared_ptr< ViewBackgroundShape > ViewBackgroundShapeSharedPtr;
 
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_VIEWBACKGROUNDSHAPE_HXX
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx
index 549e3902228a..de46f194746a 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -48,9 +48,7 @@ namespace com::sun::star {
     }
 }
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** This class is the viewable representation of a draw
             document's media object, associated to a specific View
@@ -163,7 +161,6 @@ namespace slideshow
 
         typedef ::std::shared_ptr< ViewMediaShape > ViewMediaShapeSharedPtr;
 
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_VIEWMEDIASHAPE_HXX
diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx
index a59dc0f2a2a7..c7e1d564cba0 100644
--- a/slideshow/source/engine/shapes/viewshape.hxx
+++ b/slideshow/source/engine/shapes/viewshape.hxx
@@ -51,9 +51,7 @@ namespace o3tl {
 
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** This class is the viewable representation of a draw
             document's XShape, associated to a specific View
@@ -314,7 +312,6 @@ namespace slideshow
 
         typedef ::std::shared_ptr< ViewShape > ViewShapeSharedPtr;
 
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_VIEWSHAPE_HXX
diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx
index 2d1b04bb1808..73f3fcce9c5a 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -29,9 +29,7 @@
 #include <memory>
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         class LayerEndUpdate;
         class Layer;
@@ -258,7 +256,6 @@ namespace slideshow
             bool                       mbClipSet; // true, if beginUpdate set a clip
         };
 
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_LAYER_HXX
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index ec95e08f364c..1969f0cccbb0 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -34,9 +34,7 @@ namespace basegfx {
     class B2DRange;
 }
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** A hash map which maps the XShape to the corresponding Shape object.
 
@@ -357,7 +355,7 @@ namespace slideshow
         };
 
         typedef ::std::shared_ptr< LayerManager > LayerManagerSharedPtr;
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_LAYERMANAGER_HXX
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index f084320cac99..5025450326e1 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -38,8 +38,7 @@
 #include <map>
 #include <memory>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Listener class for shape events
 
@@ -182,8 +181,7 @@ private:
     const css::uno::Reference<css::drawing::XDrawPage> mxDrawPage;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_SHAPEMANAGERIMPL_HXX
 
diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx
index 67bc6e036951..3ebc1b21b0fc 100644
--- a/slideshow/source/engine/slide/slideanimations.hxx
+++ b/slideshow/source/engine/slide/slideanimations.hxx
@@ -31,9 +31,7 @@ namespace com::sun::star::animations { class XAnimationNode; }
 
 /* Definition of SlideAnimations class */
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** This class generates and manages all animations of a slide.
 
@@ -101,7 +99,7 @@ namespace slideshow
             const basegfx::B2DVector maSlideSize;
             AnimationNodeSharedPtr   mpRootNode;
         };
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_SLIDEANIMATIONS_HXX
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.hxx b/slideshow/source/engine/slide/targetpropertiescreator.hxx
index 04dec8d59230..79c1e49a56a1 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.hxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.hxx
@@ -25,20 +25,14 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal::TargetPropertiesCreator
 {
-    namespace internal
-    {
-        namespace TargetPropertiesCreator
-        {
             /// Generate shape property list - set bInitial to true for initial slide state
             uno::Sequence< animations::TargetProperties > createTargetProperties(
                 const uno::Reference< animations::XAnimationNode >& rootNode,
                 bool bInitial );
-        }
 
-    } // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal::TargetPropertiesCreator
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_TARGETPROPERTIESCREATOR_HXX
 
diff --git a/slideshow/source/engine/slide/userpaintoverlay.hxx b/slideshow/source/engine/slide/userpaintoverlay.hxx
index 5dab806a9e76..8e9f57d30388 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.hxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.hxx
@@ -29,9 +29,7 @@
 
 /* Definition of UserPaintOverlay class */
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         class EventMultiplexer;
         struct SlideShowContext;
@@ -77,7 +75,7 @@ namespace slideshow
             ::std::shared_ptr<PaintOverlayHandler>    mpHandler;
             EventMultiplexer&                           mrMultiplexer;
         };
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_USERPAINTOVERLAY_HXX
diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx
index cb43fb92c5ed..decc63dab0ef 100644
--- a/slideshow/source/engine/transitions/barndoorwipe.hxx
+++ b/slideshow/source/engine/transitions/barndoorwipe.hxx
@@ -26,8 +26,7 @@
 #include "transitiontools.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generate a barn door wipe or double barn door wipe:
 class BarnDoorWipe : public ParametricPolyPolygon
@@ -41,7 +40,7 @@ private:
     const bool m_doubled;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_BARNDOORWIPE_HXX
diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.hxx b/slideshow/source/engine/transitions/barwipepolypolygon.hxx
index 62ba19f44042..610e50857f04 100644
--- a/slideshow/source/engine/transitions/barwipepolypolygon.hxx
+++ b/slideshow/source/engine/transitions/barwipepolypolygon.hxx
@@ -24,8 +24,7 @@
 #include "transitiontools.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generates a horizontal, left-to-right bar wipe:
 class BarWipePolyPolygon : public ParametricPolyPolygon
@@ -41,7 +40,7 @@ private:
     const ::basegfx::B2DPolygon m_unitRect;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_BARWIPEPOLYPOLYGON_HXX
diff --git a/slideshow/source/engine/transitions/boxwipe.hxx b/slideshow/source/engine/transitions/boxwipe.hxx
index 720720864e81..d542e3e56793 100644
--- a/slideshow/source/engine/transitions/boxwipe.hxx
+++ b/slideshow/source/engine/transitions/boxwipe.hxx
@@ -24,8 +24,7 @@
 #include "transitiontools.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generates a default topleft to right bottom box wipe
 class BoxWipe : public ParametricPolyPolygon
@@ -40,7 +39,7 @@ private:
     const ::basegfx::B2DPolyPolygon m_unitRect;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_BOXWIPE_HXX
diff --git a/slideshow/source/engine/transitions/checkerboardwipe.hxx b/slideshow/source/engine/transitions/checkerboardwipe.hxx
index ee206e5dd9fa..e3d70f68dfa3 100644
--- a/slideshow/source/engine/transitions/checkerboardwipe.hxx
+++ b/slideshow/source/engine/transitions/checkerboardwipe.hxx
@@ -26,8 +26,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generate a check board wipe (across)
 class CheckerBoardWipe : public ParametricPolyPolygon
@@ -43,7 +42,7 @@ private:
     const ::basegfx::B2DPolyPolygon m_unitRect;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CHECKERBOARDWIPE_HXX
diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx
index bc3e7b61ab12..666aef63bf18 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.hxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.hxx
@@ -26,9 +26,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** Generates the final clipping polygon.
 
@@ -79,7 +77,7 @@ namespace slideshow
             bool                               mbFlip;
         };
 
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CLIPPINGFUNCTOR_HXX
diff --git a/slideshow/source/engine/transitions/clockwipe.hxx b/slideshow/source/engine/transitions/clockwipe.hxx
index cd54086f6925..437f308285f3 100644
--- a/slideshow/source/engine/transitions/clockwipe.hxx
+++ b/slideshow/source/engine/transitions/clockwipe.hxx
@@ -24,8 +24,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generates a clockWiseTwelve clock wipe:
 class ClockWipe : public ParametricPolyPolygon
@@ -36,7 +35,7 @@ public:
     virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CLOCKWIPE_HXX
diff --git a/slideshow/source/engine/transitions/combtransition.hxx b/slideshow/source/engine/transitions/combtransition.hxx
index 37b288ae67fd..c9648e59d2a1 100644
--- a/slideshow/source/engine/transitions/combtransition.hxx
+++ b/slideshow/source/engine/transitions/combtransition.hxx
@@ -22,8 +22,7 @@
 
 #include "slidechangebase.hxx"
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Comb transition class.
 
@@ -57,8 +56,7 @@ private:
     void renderComb( double t, const ViewEntry& rViewEntry ) const;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_COMBTRANSITION_HXX
 
diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx
index eee6e32e5179..eca5d865c0ef 100644
--- a/slideshow/source/engine/transitions/doublediamondwipe.hxx
+++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx
@@ -25,8 +25,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generates a double diamond wipe:
 class DoubleDiamondWipe : public ParametricPolyPolygon
@@ -36,7 +35,7 @@ public:
     virtual ::basegfx::B2DPolyPolygon operator()( double x ) override;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_DOUBLEDIAMONDWIPE_HXX
diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx
index 9a86469a5d06..41b488664a9c 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.hxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.hxx
@@ -23,8 +23,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generate an iris wipe
 class EllipseWipe : public ParametricPolyPolygon
@@ -36,7 +35,7 @@ private:
     sal_Int32 mnSubType;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_ELLIPSEWIPE_HXX
diff --git a/slideshow/source/engine/transitions/fanwipe.hxx b/slideshow/source/engine/transitions/fanwipe.hxx
index dc457c0d2fb1..99434082edb6 100644
--- a/slideshow/source/engine/transitions/fanwipe.hxx
+++ b/slideshow/source/engine/transitions/fanwipe.hxx
@@ -23,8 +23,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generates a centerTop (center=true) or double fan wipe:
 class FanWipe : public ParametricPolyPolygon
@@ -37,7 +36,7 @@ private:
     bool m_center, m_single, m_fanIn;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_FANWIPE_HXX
diff --git a/slideshow/source/engine/transitions/figurewipe.hxx b/slideshow/source/engine/transitions/figurewipe.hxx
index f5dc91bde155..742d2dde29da 100644
--- a/slideshow/source/engine/transitions/figurewipe.hxx
+++ b/slideshow/source/engine/transitions/figurewipe.hxx
@@ -23,8 +23,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class FigureWipe : public ParametricPolyPolygon
 {
@@ -41,7 +40,7 @@ private:
     const ::basegfx::B2DPolygon m_figure;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_FIGUREWIPE_HXX
diff --git a/slideshow/source/engine/transitions/fourboxwipe.hxx b/slideshow/source/engine/transitions/fourboxwipe.hxx
index 3f2843bdbfc8..b2a501da7033 100644
--- a/slideshow/source/engine/transitions/fourboxwipe.hxx
+++ b/slideshow/source/engine/transitions/fourboxwipe.hxx
@@ -25,8 +25,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generate a 4-box wipe
 class FourBoxWipe : public ParametricPolyPolygon
@@ -41,7 +40,7 @@ private:
     const ::basegfx::B2DPolygon m_unitRect;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_FOURBOXWIPE_HXX
diff --git a/slideshow/source/engine/transitions/iriswipe.hxx b/slideshow/source/engine/transitions/iriswipe.hxx
index 966badee58bc..f818568e9ad6 100644
--- a/slideshow/source/engine/transitions/iriswipe.hxx
+++ b/slideshow/source/engine/transitions/iriswipe.hxx
@@ -25,8 +25,7 @@
 #include "transitiontools.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generate an iris wipe
 class IrisWipe : public ParametricPolyPolygon
@@ -38,7 +37,7 @@ private:
     const ::basegfx::B2DPolyPolygon m_unitRect;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_IRISWIPE_HXX
diff --git a/slideshow/source/engine/transitions/parametricpolypolygon.hxx b/slideshow/source/engine/transitions/parametricpolypolygon.hxx
index f35b0cc76184..4e2ebb98ec67 100644
--- a/slideshow/source/engine/transitions/parametricpolypolygon.hxx
+++ b/slideshow/source/engine/transitions/parametricpolypolygon.hxx
@@ -26,9 +26,7 @@
 
 /* Definition of ParametricPolyPolygon interface */
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** Interface defining a parametric poly-polygon.
 
@@ -84,7 +82,6 @@ namespace slideshow
 
         typedef ::std::shared_ptr< ParametricPolyPolygon > ParametricPolyPolygonSharedPtr;
 
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_PARAMETRICPOLYPOLYGON_HXX
diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx
index 2b188c4a1425..7a0e7aacd1fe 100644
--- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx
+++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx
@@ -22,9 +22,7 @@
 
 #include "parametricpolypolygon.hxx"
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /* Definition of Transitionfactory class */
 
@@ -33,7 +31,7 @@ namespace slideshow
             ParametricPolyPolygonSharedPtr createClipPolyPolygon( sal_Int16 nTransitionType,
                                                                          sal_Int16 nTransitionSubType );
         }
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_PARAMETRICPOLYPOLYGONFACTORY_HXX
diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx
index 1a353a64fb83..d1daae12623a 100644
--- a/slideshow/source/engine/transitions/pinwheelwipe.hxx
+++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx
@@ -23,8 +23,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generates a n-blade pinWheel wipe:
 class PinWheelWipe : public ParametricPolyPolygon
@@ -36,7 +35,7 @@ private:
     sal_Int32 m_blades;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_PINWHEELWIPE_HXX
diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx
index b6df2bb8fde9..3bc2364792b1 100644
--- a/slideshow/source/engine/transitions/randomwipe.hxx
+++ b/slideshow/source/engine/transitions/randomwipe.hxx
@@ -27,8 +27,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class RandomWipe : public ParametricPolyPolygon
 {
@@ -43,7 +42,7 @@ private:
     ::basegfx::B2DPolygon m_rect;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_RANDOMWIPE_HXX
diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx
index 492bc597128c..e80145df6a4b 100644
--- a/slideshow/source/engine/transitions/slidechangebase.hxx
+++ b/slideshow/source/engine/transitions/slidechangebase.hxx
@@ -36,8 +36,7 @@ namespace cppcanvas
     class CustomSprite;
 }
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Base class for all slide change effects.
 
@@ -197,8 +196,7 @@ private:
     bool                                mbPrefetched;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SLIDECHANGEBASE_HXX
 
diff --git a/slideshow/source/engine/transitions/snakewipe.hxx b/slideshow/source/engine/transitions/snakewipe.hxx
index ec71f4f83629..3da6918b9840 100644
--- a/slideshow/source/engine/transitions/snakewipe.hxx
+++ b/slideshow/source/engine/transitions/snakewipe.hxx
@@ -23,8 +23,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generates a snake wipe:
 class SnakeWipe : public ParametricPolyPolygon
@@ -59,7 +58,7 @@ private:
     const bool m_opposite;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SNAKEWIPE_HXX
diff --git a/slideshow/source/engine/transitions/spiralwipe.hxx b/slideshow/source/engine/transitions/spiralwipe.hxx
index fe89c0c8eda1..73f6a59c5668 100644
--- a/slideshow/source/engine/transitions/spiralwipe.hxx
+++ b/slideshow/source/engine/transitions/spiralwipe.hxx
@@ -23,8 +23,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generates a topLeftClockWise or
 /// bottomLeftCounterClockWise (flipOnYAxis=true) spiral wipe:
@@ -52,7 +51,7 @@ private:
     const bool m_fourBox;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SPIRALWIPE_HXX
diff --git a/slideshow/source/engine/transitions/sweepwipe.hxx b/slideshow/source/engine/transitions/sweepwipe.hxx
index acc10e67e11b..e010a554377a 100644
--- a/slideshow/source/engine/transitions/sweepwipe.hxx
+++ b/slideshow/source/engine/transitions/sweepwipe.hxx
@@ -23,8 +23,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class SweepWipe : public ParametricPolyPolygon
 {
@@ -39,7 +38,7 @@ private:
     const bool m_center, m_single, m_oppositeVertical, m_flipOnYAxis;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SWEEPWIPE_HXX
diff --git a/slideshow/source/engine/transitions/transitiontools.hxx b/slideshow/source/engine/transitions/transitiontools.hxx
index 53b3b4f46cb7..4f6c4915cf1f 100644
--- a/slideshow/source/engine/transitions/transitiontools.hxx
+++ b/slideshow/source/engine/transitions/transitiontools.hxx
@@ -24,8 +24,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Create a unit rect.
 ::basegfx::B2DPolygon createUnitRect();
@@ -39,7 +38,6 @@ namespace internal {
     ::basegfx::B2DPolyPolygon const & polypoly );
 
 }
-}
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_TRANSITIONTOOLS_HXX
 
diff --git a/slideshow/source/engine/transitions/veewipe.hxx b/slideshow/source/engine/transitions/veewipe.hxx
index 537fd79e005d..e17d86771e0a 100644
--- a/slideshow/source/engine/transitions/veewipe.hxx
+++ b/slideshow/source/engine/transitions/veewipe.hxx
@@ -25,8 +25,7 @@
 #include "parametricpolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generate a vee wipe
 class VeeWipe : public ParametricPolyPolygon
@@ -36,7 +35,7 @@ public:
     virtual ::basegfx::B2DPolyPolygon operator()( double x ) override;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_VEEWIPE_HXX
diff --git a/slideshow/source/engine/transitions/waterfallwipe.hxx b/slideshow/source/engine/transitions/waterfallwipe.hxx
index 6f397058cd43..821c9b7a2993 100644
--- a/slideshow/source/engine/transitions/waterfallwipe.hxx
+++ b/slideshow/source/engine/transitions/waterfallwipe.hxx
@@ -24,8 +24,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generate a vertical left waterfall wipe
 class WaterfallWipe : public ParametricPolyPolygon
@@ -38,7 +37,7 @@ private:
     ::basegfx::B2DPolygon m_waterfall;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_WATERFALLWIPE_HXX
diff --git a/slideshow/source/engine/transitions/zigzagwipe.hxx b/slideshow/source/engine/transitions/zigzagwipe.hxx
index ca927ba44b44..2126483eb859 100644
--- a/slideshow/source/engine/transitions/zigzagwipe.hxx
+++ b/slideshow/source/engine/transitions/zigzagwipe.hxx
@@ -24,8 +24,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /// Generates a left to right zigZag wipe:
 class ZigZagWipe : public ParametricPolyPolygon
@@ -46,7 +45,7 @@ public:
     virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override;
 };
 
-}
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_ZIGZAGWIPE_HXX
diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx
index b5cdadda3fe6..1044d607659a 100644
--- a/slideshow/source/engine/waitsymbol.hxx
+++ b/slideshow/source/engine/waitsymbol.hxx
@@ -31,8 +31,7 @@
 #include <memory>
 #include <vector>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class EventMultiplexer;
 typedef std::shared_ptr<class WaitSymbol> WaitSymbolSharedPtr;
@@ -82,8 +81,7 @@ private:
     bool                                       mbVisible;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif