clang-tidy modernize-concat-nested-namespace

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

95 files changed, 116 insertions, 347 deletions

diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 63b39d2d23d5..6f5a05b197cb 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -43,8 +43,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -1011,7 +1010,6 @@ AnimationActivitySharedPtr ActivitiesFactory::createSimpleActivity(
         return std::make_shared<SimpleActivity<0>>( aActivityParms, rAnim );
 }
 
-} // namespace internal
 } // namespace presentation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx
index e256b269611c..82a117f8a6d2 100644
--- a/slideshow/source/engine/activities/activitybase.cxx
+++ b/slideshow/source/engine/activities/activitybase.cxx
@@ -26,10 +26,8 @@
 #include "activitybase.hxx"
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         // TODO(P1): Elide some virtual function calls, by templifying this
         // static hierarchy
 
@@ -231,7 +229,6 @@ namespace slideshow
 
             return nT;
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/continuousactivitybase.cxx b/slideshow/source/engine/activities/continuousactivitybase.cxx
index 0928fd1bdd03..64e2377f9ab6 100644
--- a/slideshow/source/engine/activities/continuousactivitybase.cxx
+++ b/slideshow/source/engine/activities/continuousactivitybase.cxx
@@ -21,10 +21,8 @@
 #include "continuousactivitybase.hxx"
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         ContinuousActivityBase::ContinuousActivityBase( const ActivityParameters& rParms ) :
             SimpleContinuousActivityBase( rParms )
         {
@@ -36,7 +34,6 @@ namespace slideshow
             perform( calcAcceleratedTime( nSimpleTime ),
                      nRepeatCount );
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
index 0369c22851ca..38d3590da3b6 100644
--- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
+++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
@@ -24,10 +24,8 @@
 
 #include <tuple>
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase( const ActivityParameters& rParms ) :
             SimpleContinuousActivityBase( rParms ),
             maLerper( rParms.maDiscreteTimes )
@@ -56,7 +54,6 @@ namespace slideshow
                 fAlpha,
                 nRepeatCount );
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/discreteactivitybase.cxx b/slideshow/source/engine/activities/discreteactivitybase.cxx
index 2ce8286767d9..2fe0935b698a 100644
--- a/slideshow/source/engine/activities/discreteactivitybase.cxx
+++ b/slideshow/source/engine/activities/discreteactivitybase.cxx
@@ -23,10 +23,8 @@
 #include "discreteactivitybase.hxx"
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         DiscreteActivityBase::DiscreteActivityBase( const ActivityParameters& rParms ) :
             ActivityBase( rParms ),
             mpWakeupEvent( rParms.mpWakeupEvent ),
@@ -189,7 +187,6 @@ namespace slideshow
 
             ActivityBase::dispose();
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
index 5566b5883f78..9e23fc2c76c8 100644
--- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
+++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
@@ -24,10 +24,8 @@
 
 #include <sal/log.hxx>
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         SimpleContinuousActivityBase::SimpleContinuousActivityBase(
             const ActivityParameters& rParms ) :
             ActivityBase( rParms ),
@@ -244,7 +242,6 @@ namespace slideshow
 
             return isActive();
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx
index 3181e92175ff..ba982385356e 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -32,10 +32,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         ActivitiesQueue::ActivitiesQueue(
           const std::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) :
             mpTimer( pPresTimer ),
@@ -178,7 +176,6 @@ namespace slideshow
                 pActivity->dequeued();
             ActivityQueue().swap( maCurrentActivitiesReinsert );
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
index 82d5e5e4624b..94ee9e313ec9 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -34,10 +34,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         AnimatedSprite::AnimatedSprite( const ViewLayerSharedPtr&   rViewLayer,
                                         const ::basegfx::B2DSize&   rSpriteSizePixel,
                                         double                      nSpritePrio ) :
@@ -196,7 +194,6 @@ namespace slideshow
             mpSprite->show();
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index ce831d2a4aaf..9996924880ac 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -39,10 +39,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         namespace
         {
             // attention, there is a similar implementation of Animation in
@@ -1233,7 +1231,6 @@ namespace slideshow
                                    nFlags );
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx
index f407456b35ef..c6eb61d17e3c 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.cxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx
@@ -27,8 +27,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 AnimationAudioNode::AnimationAudioNode(
     const uno::Reference< animations::XAnimationNode >& xNode,
@@ -199,7 +198,6 @@ void AnimationAudioNode::checkPlayingStatus()
             "AnimationAudioNode::deactivate with delay") );
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index ef12aa97e104..01059ec39b77 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -35,8 +35,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 AnimationBaseNode::AnimationBaseNode(
     const uno::Reference< animations::XAnimationNode >&   xNode,
@@ -485,7 +484,6 @@ AttributableShapeSharedPtr const & AnimationBaseNode::getShape() const
         return mpShape; // nope, plain shape always
 }
 
-} // namespace internal
 } // namespace slideshow
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx
index ac3450ea55e3..39ca961c478f 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx
@@ -28,8 +28,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 /** Little wrapper for HSL to RGB mapping.
@@ -117,7 +116,6 @@ AnimationActivitySharedPtr AnimationColorNode::createActivity() const
     return AnimationActivitySharedPtr();
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
index 9d8e476e091b..2e8507e3a5f5 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
@@ -28,8 +28,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace EffectCommands = css::presentation::EffectCommands;
 
@@ -113,7 +112,6 @@ bool AnimationCommandNode::hasPendingAnimation() const
     return mxCommandNode->getCommand() == EffectCommands::STOPAUDIO || mpShape;
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index e39b268991ee..f9fa01b2f1fd 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -45,8 +45,7 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -588,7 +587,6 @@ void AnimationNodeFactory::showTree( AnimationNodeSharedPtr const & pRootNode )
 }
 #endif
 
-} // namespace internal
 } // namespace slideshow
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
index a78583290441..2490b6e2cbc8 100644
--- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
@@ -21,8 +21,7 @@
 #include "animationpathmotionnode.hxx"
 #include <animationfactory.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 void AnimationPathMotionNode::dispose()
 {
@@ -48,7 +47,6 @@ AnimationActivitySharedPtr AnimationPathMotionNode::createActivity() const
         true );
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx
index c2eda0ddc990..350e80fbcfe7 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx
@@ -27,8 +27,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 AnimationActivitySharedPtr AnimationSetNode::createActivity() const
 {
@@ -187,7 +186,6 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const
     return AnimationActivitySharedPtr();
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
index d40f9400bf7d..b8019d77e6a1 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
@@ -26,8 +26,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 void AnimationTransformNode::dispose()
 {
@@ -93,7 +92,6 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
     }
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
index 6a54d16a6650..13a62d89b7a1 100644
--- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
+++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
@@ -21,8 +21,7 @@
 #include "animationtransitionfilternode.hxx"
 #include <transitionfactory.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 void AnimationTransitionFilterNode::dispose()
 {
@@ -41,7 +40,6 @@ AnimationTransitionFilterNode::createActivity() const
         mxTransitionFilterNode );
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index e1044a1a364a..cde434f3d7bd 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -31,8 +31,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 namespace {
 bool isRepeatIndefinite(const uno::Reference<animations::XAnimationNode>& xNode)
 {
@@ -217,7 +216,6 @@ void BaseContainerNode::showState() const
 }
 #endif
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index 12f3610f1165..1b8a6d7fde02 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -41,8 +41,7 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -747,7 +746,6 @@ const char* BaseNode::getDescription() const
 
 #endif
 
-} // namespace internal
 } // namespace slideshow
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx
index adfed30885b7..475b1c18edc9 100644
--- a/slideshow/source/engine/animationnodes/generateevent.cxx
+++ b/slideshow/source/engine/animationnodes/generateevent.cxx
@@ -32,8 +32,7 @@
 #include <slideshowcontext.hxx>
 #include <delayevent.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 using namespace com::sun::star;
 
@@ -228,7 +227,6 @@ EventSharedPtr generateEvent(
     return pEvent;
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx
index abad7f24eb27..f509e680c04b 100644
--- a/slideshow/source/engine/animationnodes/nodetools.cxx
+++ b/slideshow/source/engine/animationnodes/nodetools.cxx
@@ -25,10 +25,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
 #if defined(DBG_UTIL)
         static sal_Int32 lcl_nOffset = 0;
 
@@ -81,7 +79,6 @@ namespace slideshow
             return (rAny >>= eTiming) && eTiming == animations::Timing_INDEFINITE;
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx
index a20bab788f84..f4c0637163e2 100644
--- a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx
@@ -23,8 +23,7 @@
 
 #include <functional>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 void ParallelTimeContainer::activate_st()
 {
@@ -54,7 +53,6 @@ void ParallelTimeContainer::notifyDeactivating(
     notifyDeactivatedChild( pChildNode );
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx
index c893bb027f36..2643c44036d8 100644
--- a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx
+++ b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx
@@ -23,8 +23,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const
 {
@@ -96,7 +95,6 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const
     return AnimationActivitySharedPtr();
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index d48fe1c45238..9a4737dd9784 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -23,8 +23,7 @@
 #include <usereventqueue.hxx>
 #include "sequentialtimecontainer.hxx"
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 void SequentialTimeContainer::activate_st()
 {
@@ -124,7 +123,6 @@ void SequentialTimeContainer::notifyDeactivating(
     }
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx
index ae01a3023976..202ce1880ee7 100644
--- a/slideshow/source/engine/attributemap.cxx
+++ b/slideshow/source/engine/attributemap.cxx
@@ -24,10 +24,8 @@
 #include <sal/log.hxx>
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         typedef ::canvas::tools::ValueMap< AttributeType > AnimateAttributeMap;
 
         AttributeType mapAttributeName( const OUString& rAttrName )
@@ -84,7 +82,6 @@ namespace slideshow
             return eAttributeType;
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx
index a7a957e7f423..4ae8b17ca6fb 100644
--- a/slideshow/source/engine/color.cxx
+++ b/slideshow/source/engine/color.cxx
@@ -27,10 +27,8 @@
 #include <algorithm>
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         namespace
         {
             // helper functions
@@ -344,7 +342,6 @@ namespace slideshow
                              (1.0-t)*rFrom.getGreen() + t*rTo.getGreen(),
                              (1.0-t)*rFrom.getBlue() + t*rTo.getBlue() );
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/delayevent.cxx b/slideshow/source/engine/delayevent.cxx
index 810f99ac328d..1690123100af 100644
--- a/slideshow/source/engine/delayevent.cxx
+++ b/slideshow/source/engine/delayevent.cxx
@@ -21,8 +21,7 @@
 #include <osl/diagnose.h>
 #include <delayevent.hxx>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 bool Delay::fire()
 {
@@ -54,7 +53,6 @@ void Delay::dispose()
     }
 }
 
-} // namespace internal
-} // namespace presentation
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index 729dc2198db1..79b1f9159a29 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -34,7 +34,7 @@
 using ::com::sun::star::uno::Reference;
 using namespace ::com::sun::star;
 
-namespace slideshow { namespace internal {
+namespace slideshow::internal {
 
 
 namespace {
@@ -436,6 +436,6 @@ void EffectRewinder::asynchronousRewindToPreviousSlide (
 }
 
 
-} } // end of namespace ::slideshow::internal
+} // end of namespace ::slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 3fd5a336234c..888f9039fd12 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -123,8 +123,7 @@ struct slideshow::internal::ListenerOperations<ViewEventHandlerWeakPtrWrapper>
     }
 };
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -1238,7 +1237,6 @@ void EventMultiplexer::notifyHyperlinkClicked(
         { return pHandler.getHandler()->handleHyperlink( hyperLink ); } );
 }
 
-} // namespace internal
 } // namespace presentation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index 8184dc92ed32..5ed44f0efd44 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -31,10 +31,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         bool EventQueue::EventEntry::operator<( const EventEntry& rEvent ) const
         {
             // negate comparison, we want priority queue to be sorted
@@ -294,7 +292,6 @@ namespace slideshow
             maNextEvents.clear();
             maNextNextEvents = ImplQueueType();
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx
index f82e09ac2f7e..e8f933632587 100644
--- a/slideshow/source/engine/expressionnodefactory.cxx
+++ b/slideshow/source/engine/expressionnodefactory.cxx
@@ -25,10 +25,8 @@
 
 /* Implementation of ExpressionNodeFactory class */
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         namespace
         {
             class ConstantValueExpression : public ExpressionNode
@@ -236,7 +234,6 @@ namespace slideshow
             return std::make_shared<MaxExpression>(rOuterFunction, rInnerFunction);
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx
index 3421d6d1cca3..4bc230154ed6 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -37,8 +37,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 PointerSymbolSharedPtr PointerSymbol::create( const uno::Reference<rendering::XBitmap>& xBitmap,
                                               ScreenUpdater&                            rScreenUpdater,
@@ -193,7 +192,6 @@ void PointerSymbol::viewsChanged(const geometry::RealPoint2D pos)
     }
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 48920bae0e51..595cc19086b9 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -47,8 +47,7 @@
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 class RehearseTimingsActivity::WakeupEvent : public Event
 {
@@ -541,7 +540,6 @@ bool RehearseTimingsActivity::MouseHandler::handleMouseMoved(
     return false;
 }
 
-} // namespace internal
 } // namespace presentation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx
index 1053770d5b5c..72768628d211 100644
--- a/slideshow/source/engine/screenupdater.cxx
+++ b/slideshow/source/engine/screenupdater.cxx
@@ -40,9 +40,7 @@ namespace {
     };
 }
 
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
 {
     typedef std::vector<
         std::pair<UnoViewSharedPtr,bool> > UpdateRequestVector;
@@ -217,8 +215,7 @@ namespace internal
     }
 
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 namespace {
 
diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx
index 383a0cbc3a2a..d96952f780ca 100644
--- a/slideshow/source/engine/shapeattributelayer.cxx
+++ b/slideshow/source/engine/shapeattributelayer.cxx
@@ -32,10 +32,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         /** Update state ids
 
             This method updates all state IDs from possible
@@ -809,7 +807,6 @@ namespace slideshow
                 mnVisibilityState;
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index 37f7b22be047..20d9a08b52e7 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -29,10 +29,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         namespace {
 
         /** Represents an applet shape.
@@ -282,7 +280,6 @@ namespace slideshow
                                 nNumPropEntries,
                                 rContext);
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index dde159ca477f..88d48b7e72e9 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -35,10 +35,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         namespace {
 
         /** Representation of a draw document's background shape.
@@ -293,7 +291,6 @@ namespace slideshow
                     xMasterPage,
                     rContext );
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 46bbb7efd2cb..9d61fb383e42 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -899,8 +899,7 @@ void ActivityImpl::end()
 
 } // anon namespace
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 std::shared_ptr<Activity> createDrawingLayerAnimActivity(
     SlideShowContext const& rContext,
@@ -928,7 +927,6 @@ std::shared_ptr<Activity> createDrawingLayerAnimActivity(
     return pActivity;
 }
 
-} // namespace internal
 } // namespace presentation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index f4a541ecd907..e8fcd0299ab3 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -49,10 +49,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
 
 
         // Private methods
@@ -1197,7 +1195,6 @@ namespace slideshow
         {
             return maSubsetting.getSubsetTreeNode( rParentNode, nNodeIndex, eNodeType );
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 4bc51e2dc08d..05cc539c1cd0 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -35,10 +35,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
 
 
         // Private methods
@@ -805,7 +803,6 @@ namespace slideshow
         }
 
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index 52b617ebf8c3..aeff0f412cc9 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -32,10 +32,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         class ExternalShapeBase::ExternalShapeBaseListener : public ViewEventHandler,
                                                              public IntrinsicAnimationEventHandler
         {
@@ -207,7 +205,6 @@ namespace slideshow
             return true;
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 3a06b8002dd7..247206adcd36 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -45,9 +45,7 @@ using namespace ::com::sun::star;
 // free support functions
 // ======================
 
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
 {
 // TODO(E2): Detect the case when svx/drawing layer is not
 // in-process, or even not on the same machine, and
@@ -426,6 +424,5 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle&       o_rScrollRect,
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index 3fe1d59ce8d7..a8a46f7ba050 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -27,10 +27,8 @@
 
 #include <memory>
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         namespace {
 
         /** Activity for intrinsic shape animations
@@ -246,7 +244,6 @@ namespace slideshow
                                                rTimeouts,
                                                nNumLoops);
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
index bd2522899156..55c302bc683c 100644
--- a/slideshow/source/engine/shapes/mediashape.cxx
+++ b/slideshow/source/engine/shapes/mediashape.cxx
@@ -33,10 +33,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         namespace {
 
         /** Represents a media shape.
@@ -244,7 +242,6 @@ namespace slideshow
             return std::make_shared<MediaShape>(xShape, nPrio, rContext);
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 06ac4275af1d..b1b1b3417269 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -47,8 +47,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -533,7 +532,6 @@ ShapeImporter::ShapeImporter( uno::Reference<drawing::XDrawPage> const&
     maShapesStack.push( XShapesEntry(xShapes) );
 }
 
-} // namespace internal
 } // namespace presentation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 756ac85d7637..736cb9d94c65 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -49,10 +49,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         ViewAppletShape::ViewAppletShape( const ViewLayerSharedPtr&                       rViewLayer,
                                           const uno::Reference< drawing::XShape >&        rxShape,
                                           const OUString&                          rServiceName,
@@ -255,7 +253,6 @@ namespace slideshow
 
             return true;
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
index 97e861e9e445..e0ca333adee2 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
@@ -40,10 +40,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
 
         bool ViewBackgroundShape::prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
                                             const GDIMetaFileSharedPtr&         rMtf ) const
@@ -185,7 +183,6 @@ namespace slideshow
             return true;
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 3e8056fa8539..d2a92580aeef 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -51,10 +51,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         ViewMediaShape::ViewMediaShape( const ViewLayerSharedPtr&                       rViewLayer,
                                         const uno::Reference< drawing::XShape >&        rxShape,
                                         const uno::Reference< uno::XComponentContext >& rxContext ) :
@@ -469,7 +467,6 @@ namespace slideshow
                 TOOLS_WARN_EXCEPTION( "slideshow", "" );
             }
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 5df9650b4cc7..4b69c4320c45 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -42,10 +42,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
 
         // TODO(F2): Provide sensible setup for mtf-related attributes (fill mode,
         // char rotation etc.). Do that via mtf argument at this object
@@ -853,7 +851,6 @@ namespace slideshow
                                bIsVisible );
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
index 4f5c797775af..5525195fe81f 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -25,10 +25,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr&       rOriginalShape,
                                   const DocTreeNode&                      rTreeNode,
                                   const SubsettableShapeManagerSharedPtr& rShapeManager ) :
@@ -118,7 +116,6 @@ namespace slideshow
             return maTreeNode;
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx
index c8ec5f5f57f8..01ce4efa4bcd 100644
--- a/slideshow/source/engine/slide/layer.cxx
+++ b/slideshow/source/engine/slide/layer.cxx
@@ -29,10 +29,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         Layer::Layer( Dummy                     ) :
             maViewEntries(),
             maBounds(),
@@ -269,7 +267,6 @@ namespace slideshow
             return LayerSharedPtr( new Layer );
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index eb97b32da11d..e7890641da4f 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -40,10 +40,8 @@ namespace
     }
 }
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         template<typename LayerFunc,
                  typename ShapeFunc> void LayerManager::manageViews(
                      LayerFunc layerFunc,
@@ -826,7 +824,6 @@ namespace slideshow
 
             mbLayerAssociationDirty = false;
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index f9480ef51403..7863f7e7412b 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -38,8 +38,7 @@ using namespace css::uno;
 using namespace css::drawing;
 using namespace css::system;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ShapeManagerImpl::ShapeManagerImpl( EventMultiplexer&            rMultiplexer,
                                     LayerManagerSharedPtr const& rLayerManager,
@@ -421,7 +420,6 @@ void ShapeManagerImpl::notifyIntrinsicAnimationsDisabled()
 }
 
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
index a6d526ba5a55..d433b7af1409 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -25,10 +25,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         SlideAnimations::SlideAnimations( const SlideShowContext&     rContext,
                                           const ::basegfx::B2DVector& rSlideSize ) :
             maContext( rContext ),
@@ -103,7 +101,6 @@ namespace slideshow
             mpRootNode->end();
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index ebd16911d2c0..3a1039a004ed 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -51,9 +51,7 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
 {
 namespace
 {
@@ -1102,7 +1100,6 @@ SlideSharedPtr createSlide( const uno::Reference< drawing::XDrawPage >&
     return pRet;
 }
 
-} // namespace internal
 } // namespace slideshow
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 0701526937b5..89ef8c835a83 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -30,9 +30,7 @@
 #include "targetpropertiescreator.hxx"
 #include <tools.hxx>
 
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
 {
     namespace
     {
@@ -366,7 +364,6 @@ namespace internal
         return aRes;
     }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 179b937d874a..045c455e69fe 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -39,10 +39,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         class PaintOverlayHandler : public MouseEventHandler,
                                     public ViewEventHandler,
                     public UserPaintEventHandler
@@ -482,7 +480,6 @@ namespace slideshow
                 TOOLS_WARN_EXCEPTION("slideshow", "");
             }
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx
index b59d4813ab9a..368cb070c15d 100644
--- a/slideshow/source/engine/slidebitmap.cxx
+++ b/slideshow/source/engine/slidebitmap.cxx
@@ -33,10 +33,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
 
         SlideBitmap::SlideBitmap( const ::cppcanvas::BitmapSharedPtr& rBitmap ) :
             maOutputPos(),
@@ -109,7 +107,6 @@ namespace slideshow
         return mxBitmap;
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slideshowcontext.cxx b/slideshow/source/engine/slideshowcontext.cxx
index 94d8c83cd96b..8c0811e9ecf7 100644
--- a/slideshow/source/engine/slideshowcontext.cxx
+++ b/slideshow/source/engine/slideshowcontext.cxx
@@ -32,9 +32,7 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
 {
 
 SlideShowContext::SlideShowContext( SubsettableShapeManagerSharedPtr& rSubsettableShapeManager,
@@ -65,7 +63,6 @@ void SlideShowContext::dispose()
     mxComponentContext.clear();
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 21f382220eb9..f470b90b81ab 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -58,8 +58,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -1194,7 +1193,6 @@ UnoViewSharedPtr createSlideView( uno::Reference< presentation::XSlideShowView>
     return that;
 }
 
-} // namespace internal
 } // namespace slideshow
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 4953ccde2fcc..6f67f8ac0487 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -46,10 +46,8 @@
 
 /* Implementation of SmilFunctionParser class */
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         namespace
         {
             typedef const char*                   StringIteratorT;
@@ -604,7 +602,6 @@ namespace slideshow
 
             return pContext->maOperandStack.top();
         }
-    }
 }
 
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx
index 0b411d292f9f..c9386192e8d6 100644
--- a/slideshow/source/engine/soundplayer.cxx
+++ b/slideshow/source/engine/soundplayer.cxx
@@ -34,10 +34,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         // TODO(Q3): Move the whole SoundPlayer class to avmedia.
 
         std::shared_ptr<SoundPlayer> SoundPlayer::create(
@@ -169,7 +167,6 @@ namespace slideshow
         {
             return mxPlayer->isPlaying();
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index 8afcc9739650..1fbb673ff61e 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -52,10 +52,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         namespace
         {
             class NamedValueComparator
@@ -766,7 +764,6 @@ namespace slideshow
                 basegfx::fround( aTmpRect.getRange().getX() ) + 1,
                 basegfx::fround( aTmpRect.getRange().getY() ) + 1 );
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/barndoorwipe.cxx b/slideshow/source/engine/transitions/barndoorwipe.cxx
index ffe799dd1bb3..c2621f9318cd 100644
--- a/slideshow/source/engine/transitions/barndoorwipe.cxx
+++ b/slideshow/source/engine/transitions/barndoorwipe.cxx
@@ -24,8 +24,7 @@
 #include "barndoorwipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon BarnDoorWipe::operator () ( double t )
 {
@@ -51,6 +50,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.cxx b/slideshow/source/engine/transitions/barwipepolypolygon.cxx
index 5a7a381bfc37..d2f28df7d3d0 100644
--- a/slideshow/source/engine/transitions/barwipepolypolygon.cxx
+++ b/slideshow/source/engine/transitions/barwipepolypolygon.cxx
@@ -22,8 +22,7 @@
 #include "barwipepolypolygon.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon BarWipePolyPolygon::operator () ( double t )
 {
@@ -42,6 +41,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/boxwipe.cxx b/slideshow/source/engine/transitions/boxwipe.cxx
index dabcc47e5ac3..0844a905cb56 100644
--- a/slideshow/source/engine/transitions/boxwipe.cxx
+++ b/slideshow/source/engine/transitions/boxwipe.cxx
@@ -22,8 +22,7 @@
 #include "boxwipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon BoxWipe::operator () ( double t )
 {
@@ -43,6 +42,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/checkerboardwipe.cxx b/slideshow/source/engine/transitions/checkerboardwipe.cxx
index 8512e398efa7..a88224a33215 100644
--- a/slideshow/source/engine/transitions/checkerboardwipe.cxx
+++ b/slideshow/source/engine/transitions/checkerboardwipe.cxx
@@ -22,8 +22,7 @@
 #include "checkerboardwipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon CheckerBoardWipe::operator () ( double t )
 {
@@ -51,6 +50,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index 5aa3857a7712..ae64b8e6731f 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -26,10 +26,8 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         ClippingFunctor::ClippingFunctor(const ParametricPolyPolygonSharedPtr&   rPolygon,
                                          const TransitionInfo&                   rTransitionInfo,
                                          bool                                    bDirectionForward,
@@ -211,7 +209,6 @@ namespace slideshow
             return aClipPoly;
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/clockwipe.cxx b/slideshow/source/engine/transitions/clockwipe.cxx
index cd4360b3672c..bba29bfca4fa 100644
--- a/slideshow/source/engine/transitions/clockwipe.cxx
+++ b/slideshow/source/engine/transitions/clockwipe.cxx
@@ -24,8 +24,7 @@
 #include "clockwipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolygon ClockWipe::calcCenteredClock( double t, double e )
 {
@@ -59,6 +58,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/combtransition.cxx b/slideshow/source/engine/transitions/combtransition.cxx
index 90a2f56fa0ca..d1dbe9b15db5 100644
--- a/slideshow/source/engine/transitions/combtransition.cxx
+++ b/slideshow/source/engine/transitions/combtransition.cxx
@@ -25,8 +25,7 @@
 
 #include "combtransition.hxx"
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -174,7 +173,6 @@ bool CombTransition::operator()( double t )
     return true;
 }
 
-} // namespace internal
-} // namespace presentation
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/doublediamondwipe.cxx b/slideshow/source/engine/transitions/doublediamondwipe.cxx
index 220f3ec8c6f8..9c482000d636 100644
--- a/slideshow/source/engine/transitions/doublediamondwipe.cxx
+++ b/slideshow/source/engine/transitions/doublediamondwipe.cxx
@@ -22,8 +22,7 @@
 #include "doublediamondwipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon DoubleDiamondWipe::operator () ( double t )
 {
@@ -51,6 +50,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/ellipsewipe.cxx b/slideshow/source/engine/transitions/ellipsewipe.cxx
index f8647b3becb7..7a5001efd70b 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.cxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.cxx
@@ -23,8 +23,7 @@
 #include "ellipsewipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon EllipseWipe::operator () ( double t )
 {
@@ -48,6 +47,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/fanwipe.cxx b/slideshow/source/engine/transitions/fanwipe.cxx
index fb61ee9402a7..b86b0def2d5b 100644
--- a/slideshow/source/engine/transitions/fanwipe.cxx
+++ b/slideshow/source/engine/transitions/fanwipe.cxx
@@ -25,8 +25,7 @@
 #include "fanwipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon FanWipe::operator () ( double t )
 {
@@ -57,6 +56,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/figurewipe.cxx b/slideshow/source/engine/transitions/figurewipe.cxx
index caf573bfda6a..1445eeb25139 100644
--- a/slideshow/source/engine/transitions/figurewipe.cxx
+++ b/slideshow/source/engine/transitions/figurewipe.cxx
@@ -25,8 +25,7 @@
 #include "figurewipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon FigureWipe::operator () ( double t )
 {
@@ -114,6 +113,5 @@ FigureWipe * FigureWipe::createStarWipe( sal_Int32 nPoints )
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/fourboxwipe.cxx b/slideshow/source/engine/transitions/fourboxwipe.cxx
index 49106916950a..74833c2e05ae 100644
--- a/slideshow/source/engine/transitions/fourboxwipe.cxx
+++ b/slideshow/source/engine/transitions/fourboxwipe.cxx
@@ -25,8 +25,7 @@
 #include "fourboxwipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon FourBoxWipe::operator () ( double t )
 {
@@ -71,6 +70,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/iriswipe.cxx b/slideshow/source/engine/transitions/iriswipe.cxx
index 02a9cd333161..72d3e5a61bdf 100644
--- a/slideshow/source/engine/transitions/iriswipe.cxx
+++ b/slideshow/source/engine/transitions/iriswipe.cxx
@@ -23,8 +23,7 @@
 #include "iriswipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon IrisWipe::operator () ( double t )
 {
@@ -38,6 +37,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
index 94ee99cecd48..f95d4e3f72fc 100644
--- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
+++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
@@ -47,10 +47,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         ParametricPolyPolygonSharedPtr
         ParametricPolyPolygonFactory::createClipPolyPolygon(
             sal_Int16 nType, sal_Int16 nSubType )
@@ -271,7 +269,6 @@ namespace slideshow
 
             return ParametricPolyPolygonSharedPtr();
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/pinwheelwipe.cxx b/slideshow/source/engine/transitions/pinwheelwipe.cxx
index 646d3a04afa1..74522a8e6dfc 100644
--- a/slideshow/source/engine/transitions/pinwheelwipe.cxx
+++ b/slideshow/source/engine/transitions/pinwheelwipe.cxx
@@ -23,8 +23,7 @@
 #include "pinwheelwipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon PinWheelWipe::operator () ( double t )
 {
@@ -43,6 +42,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx
index 4dd16f3f9278..58047a676f82 100644
--- a/slideshow/source/engine/transitions/randomwipe.cxx
+++ b/slideshow/source/engine/transitions/randomwipe.cxx
@@ -26,8 +26,7 @@
 #include <tools.hxx>
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars )
     : m_positions( new ::basegfx::B2DPoint[ nElements ] ),
@@ -79,6 +78,5 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars )
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index ce4da4cb1611..d0ff5325e252 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -33,8 +33,7 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /***************************************************
  ***                                             ***
@@ -366,6 +365,5 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition(
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index e0ef0b060b1f..a3edf1a8e882 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -30,8 +30,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 SlideChangeBase::SlideChangeBase( o3tl::optional<SlideSharedPtr> const & leavingSlide,
                                   const SlideSharedPtr&                   pEnteringSlide,
@@ -506,7 +505,6 @@ void SlideChangeBase::clearViewEntry( ViewEntry& rEntry )
     rEntry.mpOutSprite.reset();
 }
 
-} // namespace internal
 } // namespace presentation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 52b2bdc0b105..6c12603836f1 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -45,8 +45,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -1102,7 +1101,6 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
     return NumberAnimationSharedPtr();
 }
 
-} // namespace internal
 } // namespace presentation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx
index efa8960bbfd1..ceaa1d00192b 100644
--- a/slideshow/source/engine/transitions/snakewipe.cxx
+++ b/slideshow/source/engine/transitions/snakewipe.cxx
@@ -31,8 +31,7 @@
 #include "transitiontools.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
     : m_sqrtElements( static_cast<sal_Int32>(
@@ -235,6 +234,5 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/spiralwipe.cxx b/slideshow/source/engine/transitions/spiralwipe.cxx
index a00c95b0984e..3d1dc0282ea1 100644
--- a/slideshow/source/engine/transitions/spiralwipe.cxx
+++ b/slideshow/source/engine/transitions/spiralwipe.cxx
@@ -27,8 +27,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis )
     : m_elements(nElements),
@@ -117,6 +116,5 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis )
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/sweepwipe.cxx b/slideshow/source/engine/transitions/sweepwipe.cxx
index bb6a3e40e69e..e6fcb8c2d028 100644
--- a/slideshow/source/engine/transitions/sweepwipe.cxx
+++ b/slideshow/source/engine/transitions/sweepwipe.cxx
@@ -25,8 +25,7 @@
 #include "transitiontools.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon SweepWipe::operator () ( double t )
 {
@@ -69,6 +68,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx
index 15cd451d0a0b..6ec5a57f56aa 100644
--- a/slideshow/source/engine/transitions/transitionfactorytab.cxx
+++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx
@@ -29,8 +29,7 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -2130,7 +2129,6 @@ const TransitionInfo* getRandomTransitionInfo()
         - 1 /* exclude random transition at end of table */ );
 }
 
-} // namespace internal
 } // namespace presentation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/transitiontools.cxx b/slideshow/source/engine/transitions/transitiontools.cxx
index adadaa57eb70..e930028f60a1 100644
--- a/slideshow/source/engine/transitions/transitiontools.cxx
+++ b/slideshow/source/engine/transitions/transitiontools.cxx
@@ -24,8 +24,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 // TODO(Q2): Move this to basegfx
 ::basegfx::B2DPolygon createUnitRect()
@@ -54,6 +53,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/veewipe.cxx b/slideshow/source/engine/transitions/veewipe.cxx
index 8b1f123f957a..48fc4304b6e6 100644
--- a/slideshow/source/engine/transitions/veewipe.cxx
+++ b/slideshow/source/engine/transitions/veewipe.cxx
@@ -22,8 +22,7 @@
 #include "veewipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ::basegfx::B2DPolyPolygon VeeWipe::operator () ( double t )
 {
@@ -39,6 +38,5 @@ namespace internal {
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/waterfallwipe.cxx b/slideshow/source/engine/transitions/waterfallwipe.cxx
index a1743993d049..c3ef81ca5f7c 100644
--- a/slideshow/source/engine/transitions/waterfallwipe.cxx
+++ b/slideshow/source/engine/transitions/waterfallwipe.cxx
@@ -25,8 +25,7 @@
 #include "transitiontools.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 WaterfallWipe::WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis )
     : m_flipOnYAxis( flipOnYAxis )
@@ -62,6 +61,5 @@ WaterfallWipe::WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis )
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/zigzagwipe.cxx b/slideshow/source/engine/transitions/zigzagwipe.cxx
index 0e2e64c62b64..9b1f14221175 100644
--- a/slideshow/source/engine/transitions/zigzagwipe.cxx
+++ b/slideshow/source/engine/transitions/zigzagwipe.cxx
@@ -25,8 +25,7 @@
 #include "zigzagwipe.hxx"
 
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ZigZagWipe::ZigZagWipe( sal_Int32 nZigs ) : m_zigEdge( 1.0 / nZigs )
 {
@@ -67,6 +66,5 @@ ZigZagWipe::ZigZagWipe( sal_Int32 nZigs ) : m_zigEdge( 1.0 / nZigs )
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx
index 8306085ab5cc..69537433ae9b 100644
--- a/slideshow/source/engine/unoviewcontainer.cxx
+++ b/slideshow/source/engine/unoviewcontainer.cxx
@@ -28,10 +28,8 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         UnoViewContainer::UnoViewContainer() :
             maViews()
         {
@@ -96,7 +94,6 @@ namespace slideshow
                 pView->_dispose();
             maViews.clear();
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 51a725fa7de7..2dfeba8221ff 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -38,8 +38,7 @@ using namespace com::sun::star;
 
 /* Implementation of UserEventQueue class */
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 namespace {
 
@@ -792,7 +791,6 @@ void UserEventQueue::callSkipEffectEventHandler()
         pHandler->skipEffect();
 }
 
-} // namespace internal
 } // namespace presentation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx
index c7f31906b7f5..83f1858e9294 100644
--- a/slideshow/source/engine/waitsymbol.cxx
+++ b/slideshow/source/engine/waitsymbol.cxx
@@ -37,8 +37,7 @@
 
 using namespace com::sun::star;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 const sal_Int32 LEFT_BORDER_SPACE  = 10;
 const sal_Int32 LOWER_BORDER_SPACE = 10;
@@ -177,7 +176,6 @@ void WaitSymbol::viewsChanged()
     }
 }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx
index 9f114b4ae227..9658661dc785 100644
--- a/slideshow/source/engine/wakeupevent.cxx
+++ b/slideshow/source/engine/wakeupevent.cxx
@@ -24,10 +24,8 @@
 #include <wakeupevent.hxx>
 
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         WakeupEvent::WakeupEvent(
             std::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
             ActivitiesQueue& rActivityQueue ) :
@@ -82,7 +80,6 @@ namespace slideshow
         {
             mpActivity = rActivity;
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */