compact namespace in sd

Change-Id: Ifa8b9cb2a6c06e0365245790cfd1c4775bd87d15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93861 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
author: Noel Grandin <noel.grandin@collabora.co.uk> 2020-05-09 15:54:06 +0200
committer: Noel Grandin <noel.grandin@collabora.co.uk> 2020-05-09 20:02:29 +0200
commit: 00d170213a112922980db67df62b8ee324ff2631 (patch)
tree: a277feaf79a3014a777f25e87730a013da919c2d /sd/source
parent: 32ff26f771a90050f524968dfd5381818274f673 (diff)
175 files changed, 531 insertions, 617 deletions
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 7699c09158fe..04255e711d99 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -32,13 +32,13 @@
 
 #include "epptbase.hxx"
 
-namespace com { namespace sun { namespace star { namespace awt { class XControlModel; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
-namespace com { namespace sun { namespace star { namespace text { class XSimpleText; } } } }
+namespace com::sun::star::awt { class XControlModel; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::task { class XStatusIndicator; }
+namespace com::sun::star::text { class XSimpleText; }
 
 class SotStorage;
 
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index a5c1a4842f5b..776a44e9fbb6 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -36,17 +36,17 @@
 
 #include "grouptable.hxx"
 
-namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XMasterPagesSupplier; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPages; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPagesSupplier; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+namespace com::sun::star::task { class XStatusIndicator; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::awt { struct Rectangle; }
+namespace com::sun::star::drawing { class XMasterPagesSupplier; }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::drawing { class XDrawPages; }
+namespace com::sun::star::drawing { class XDrawPagesSupplier; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::drawing { class XShapes; }
 
 class VirtualDevice;
 
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index 99cff57b844c..87432a7b5cb0 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -31,11 +31,11 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace animations { class XAnimate; } } } }
-namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com::sun::star::animations { class XAnimate; }
+namespace com::sun::star::animations { class XAnimationNode; }
+namespace com::sun::star::beans { struct NamedValue; }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::drawing { class XShape; }
 namespace ppt { class ExSoundCollection; }
 
 class SvStream;
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 4b9c85d9c9fd..2b9a4dd90a9d 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -28,12 +28,12 @@
 #include <vector>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
-namespace awt { struct FontDescriptor; }
-namespace beans { class XPropertyState; }
-namespace text { class XTextRange; class XTextContent; class XSimpleText; }
-namespace style { struct TabStop; }
-}}}
+namespace com::sun::star {
+    namespace awt { struct FontDescriptor; }
+    namespace beans { class XPropertyState; }
+    namespace text { class XTextRange; class XTextContent; class XSimpleText; }
+    namespace style { struct TabStop; }
+}
 
 struct SOParagraph
 {
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index f49dde487f39..1622bc4a0e0c 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -32,8 +32,8 @@
 #include <vector>
 
 namespace basegfx { class B2DPolyPolygon; }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace ucb { class XSimpleFileAccess3; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::ucb { class XSimpleFileAccess3; }
 namespace sd { class DrawDocShell; }
 namespace tools { class Rectangle; }
 
@@ -54,7 +54,7 @@ class SdPage;
 class HtmlState;
 class SdrTextObj;
 class SdrObjGroup;
-namespace sdr { namespace table { class SdrTableObj; } }
+namespace sdr::table { class SdrTableObj; }
 class SdrPage;
 class SdDrawDocument;
 class ButtonSet;
diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx
index 7964304c1abb..f7f59e8be854 100644
--- a/sd/source/filter/ppt/pptinanimations.hxx
+++ b/sd/source/filter/ppt/pptinanimations.hxx
@@ -29,8 +29,8 @@
 #include <stdio.h>
 #endif
 
-namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com::sun::star::animations { class XAnimationNode; }
+namespace com::sun::star::drawing { class XDrawPage; }
 namespace ppt { struct AnimationNode; }
 
 class DffRecordHeader;
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 95ee309c5f0f..f704e1b92b4f 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -28,7 +28,7 @@
 #include <vcl/weld.hxx>
 #include <CustomAnimationEffect.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com::sun::star::drawing { class XShape; }
 
 struct ImplSVEvent;
 class VclBuilder;
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index adecbaa976a5..078bb5e69efe 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -28,21 +28,14 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawView; } } } }
-
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::drawing { class XDrawView; }
 namespace weld { class ComboBox; }
+namespace com::sun::star::animations { class XAnimationNode; }
+namespace sd::tools { class EventMultiplexerEvent; }
 
 enum class PathKind { NONE, CURVE, POLYGON, FREEFORM };
 
-namespace com { namespace sun { namespace star { namespace animations {
-    class XAnimationNode;
-} } } }
-
-namespace sd { namespace tools {
-class EventMultiplexerEvent;
-} }
-
 namespace sd {
 
 class STLPropertySet;
diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx
index c670aeeb0e69..82d596c90c23 100644
--- a/sd/source/ui/animations/motionpathtag.hxx
+++ b/sd/source/ui/animations/motionpathtag.hxx
@@ -25,7 +25,7 @@
 #include <smarttag.hxx>
 #include "CustomAnimationList.hxx"
 
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com::sun::star::drawing { class XShape; }
 class SdrPathObj;
 
 namespace sd {
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 19c0ce21929e..92d27cd8a81b 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -29,9 +29,9 @@
 
 #include "annotationtag.hxx"
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawView; } } } }
-namespace com { namespace sun { namespace star { namespace office { class XAnnotationAccess; } } } }
-namespace com { namespace sun { namespace star { namespace office { class XAnnotation; } } } }
+namespace com::sun::star::drawing { class XDrawView; }
+namespace com::sun::star::office { class XAnnotationAccess; }
+namespace com::sun::star::office { class XAnnotation; }
 
 class SfxRequest;
 class SdPage;
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index f294db977177..f05b62cd8380 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -23,7 +23,7 @@
 #include <smarttag.hxx>
 #include "annotationwindow.hxx"
 
-namespace com { namespace sun { namespace star { namespace office { class XAnnotation; } } } }
+namespace com::sun::star::office { class XAnnotation; }
 
 namespace sd {
 
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index d6531c38a285..aa28144bd1d2 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -27,7 +27,7 @@
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 
-namespace com { namespace sun { namespace star { namespace office { class XAnnotation; } } } }
+namespace com::sun::star::office { class XAnnotation; }
 
 class OutlinerView;
 class Outliner;
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index fced2d7c32c6..dc83b89ab586 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -18,9 +18,9 @@
 
 #include <com/sun/star/awt/Size.hpp>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPages; } } } }
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphicProvider; } } } }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::drawing { class XDrawPages; }
+namespace com::sun::star::graphic { class XGraphicProvider; }
 
 class SdDrawDocument;
 class GraphicFilter;
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
index d63a64822c49..4961f0dc2cbb 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
@@ -24,9 +24,9 @@
 
 #include <queue>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationChangeRequest; } } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationChangeRequest; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** The ChangeRequestQueue stores the pending requests for changes to the
     requested configuration.  It is the task of the
@@ -41,7 +41,7 @@ public:
     ChangeRequestQueue();
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index 86a0324b409f..fcd433b8f2ae 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -27,12 +27,12 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationChangeRequest; } } } } }
+namespace com::sun::star::drawing::framework { class XConfiguration; }
+namespace com::sun::star::drawing::framework { class XConfigurationChangeRequest; }
 
 struct ImplSVEvent;
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 class ConfigurationUpdater;
 
@@ -116,7 +116,7 @@ private:
     DECL_LINK(ProcessEvent, void*, void);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
index 8753c4a73d59..9bf953a105f8 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
@@ -25,10 +25,10 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+namespace com::sun::star::drawing::framework { class XConfiguration; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** A ConfigurationClassifier object compares two configurations of
     resources and gives access to the differences.  It is used mainly when
@@ -158,7 +158,7 @@ private:
         ResourceIdVector& rTarget);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
index 768308941d04..a15ca145fea5 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
@@ -25,13 +25,13 @@
 #include <unordered_map>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationChangeListener; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResource; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { struct ConfigurationChangeEvent; } } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationChangeListener; }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::drawing::framework { class XResource; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
+namespace com::sun::star::drawing::framework { struct ConfigurationChangeEvent; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** This class manages the set of XConfigurationChangeListeners and
     calls them when the ConfigurationController wants to broadcast an
@@ -134,7 +134,7 @@ private:
         const css::drawing::framework::ConfigurationChangeEvent& rEvent);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
index 03e8e62d30f8..0d7c6b6284a9 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
@@ -28,12 +28,12 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceFactory; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResource; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+namespace com::sun::star::drawing::framework { class XConfiguration; }
+namespace com::sun::star::drawing::framework { class XResourceFactory; }
+namespace com::sun::star::drawing::framework { class XResource; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 class ConfigurationControllerBroadcaster;
 class ResourceFactoryManager;
@@ -137,7 +137,7 @@ private:
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
index facedd3f4600..8c7950443aa1 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
@@ -22,11 +22,11 @@
 
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::drawing::framework { class XConfiguration; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** Print debug information about configurations to the standard error
     output channel.
@@ -45,7 +45,7 @@ public:
 #endif
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index c43f9179d604..51348321d548 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -25,11 +25,11 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XControllerManager; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+namespace com::sun::star::drawing::framework { class XConfiguration; }
+namespace com::sun::star::drawing::framework { class XControllerManager; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 class ConfigurationClassifier;
 class ConfigurationUpdaterLock;
@@ -196,7 +196,7 @@ private:
     DECL_LINK(TimeoutHandler, Timer *, void);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
index 657c1b0f1f95..7d446e997ff1 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
@@ -25,10 +25,10 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <cppuhelper/compbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+namespace com::sun::star::drawing::framework { class XConfiguration; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
       css::drawing::framework::XConfigurationChangeRequest,
@@ -96,7 +96,7 @@ private:
     const Mode meMode;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index 9b8ce6163b83..4684d3baffee 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -30,11 +30,11 @@
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XControllerManager; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceFactory; } } } } }
-namespace com { namespace sun { namespace star { namespace util { class XURLTransformer; } } } }
+namespace com::sun::star::drawing::framework { class XControllerManager; }
+namespace com::sun::star::drawing::framework { class XResourceFactory; }
+namespace com::sun::star::util { class XURLTransformer; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** Container of resource factories of the drawing framework.
 */
@@ -116,7 +116,7 @@ private:
         const OUString& rsURLBase);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx
index 5fb779cac636..de48e60e03b2 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.hxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <cppuhelper/compbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
+namespace com::sun::star::drawing::framework { class XConfiguration; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
       css::drawing::framework::XConfigurationChangeRequest,
@@ -68,7 +68,7 @@ public:
     virtual void SAL_CALL setName (const OUString& rName) override;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index c22ba9cf9976..af8786a6717d 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -28,15 +28,15 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace sd {
 
 class ViewShellBase;
 }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::lang::XInitialization,
@@ -128,7 +128,7 @@ private:
     void ThrowIfDisposed() const;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
index 780710d8cfb0..fd237fca74c6 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
@@ -25,11 +25,11 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XResourceFactory,
@@ -82,7 +82,7 @@ private:
     void ThrowIfDisposed() const;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index e4aaf65f3396..b89bc1fa0b48 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -30,8 +30,8 @@
 #include <vcl/vclptr.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XPane; } } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::drawing::framework { class XPane; }
 
 namespace sd {
 class ViewShell;
@@ -41,7 +41,7 @@ class FrameView;
 class SfxViewFrame;
 namespace vcl { class Window; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XResourceFactory,
@@ -128,7 +128,7 @@ private:
         const css::uno::Reference<css::drawing::framework::XPane>& rxPane);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index b9d4edfc01db..72724690d731 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -30,10 +30,10 @@
 class SfxShell;
 
 namespace sd { class ViewShellBase; }
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::ImplInheritanceHelper <
     ::sd::framework::Pane,
@@ -97,7 +97,7 @@ private:
     bool mbHasBeenActivated;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx
index 2f4af60c0b1e..d19d18e67f9e 100644
--- a/sd/source/ui/framework/factories/FrameWindowPane.hxx
+++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx
@@ -22,9 +22,9 @@
 
 #include <framework/Pane.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+namespace com::sun::star::drawing::framework { class XResourceId; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** This subclass is not necessary anymore.  We can remove it if that
     remains so.
@@ -45,7 +45,7 @@ public:
     virtual sal_Bool SAL_CALL isAnchorOnly() override;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index 41b49fabe16b..73e560d08635 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -27,9 +27,9 @@
 class VclWindowEvent;
 
 namespace vcl { class Window; }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** The full screen pane creates a pane that covers the complete application
     window, i.e. that hides menu bar, tool bars, status bars.
@@ -81,7 +81,7 @@ private:
         sal_Int32& rnScreenNumberReturnValue);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
index 61081be1e703..ab31ee038539 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@@ -25,8 +25,8 @@
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
 #include <cppuhelper/compbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::frame { class XController; }
 
 namespace sd {
 
@@ -34,7 +34,7 @@ class ViewShellBase;
 
 }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XConfigurationChangeListener
@@ -87,7 +87,7 @@ private:
         const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 7d25863a6d97..3a93a7fd590c 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -30,8 +30,8 @@
 #include <cppuhelper/compbase.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::frame { class XController; }
 
 namespace sd {
 
@@ -39,7 +39,7 @@ class ViewShellBase;
 
 }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XConfigurationChangeListener
@@ -90,7 +90,7 @@ private:
     bool IsPrinting() const;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx
index f70457d43dad..ef671d264d2b 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.hxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@@ -26,12 +26,12 @@
 #include <memory>
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XControllerManager; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XTabBar; } } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::drawing::framework { class XControllerManager; }
+namespace com::sun::star::drawing::framework { class XTabBar; }
+namespace com::sun::star::frame { class XController; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XConfigurationChangeListener
@@ -95,7 +95,7 @@ private:
         const css::uno::Reference<css::drawing::framework::XTabBar>& rxViewTabBar);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index b8df4f1084fc..96b2dd377802 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -27,14 +27,14 @@
 #include <o3tl/deleter.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::frame { class XController; }
 
 namespace sd {
 class ViewShellBase;
 }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XConfigurationChangeListener
@@ -79,7 +79,7 @@ private:
     void HandleUpdateEnd();
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index 88333b0d9d71..0de368e256ec 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -25,11 +25,11 @@
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
 #include <cppuhelper/compbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XTabBar; } } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::drawing::framework { class XTabBar; }
+namespace com::sun::star::frame { class XController; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XConfigurationChangeListener
@@ -82,7 +82,7 @@ private:
         const css::uno::Reference<css::drawing::framework::XTabBar>& rxTabBar);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index ee2acf119ce4..fecd6fe2115f 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -37,9 +37,9 @@
 
 #include "Window.hxx"
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::awt { class XWindow; }
 
 class VclWindowEvent;
 
diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx
index ced504f020d3..9941ee4679f3 100644
--- a/sd/source/ui/inc/AccessiblePageShape.hxx
+++ b/sd/source/ui/inc/AccessiblePageShape.hxx
@@ -22,8 +22,8 @@
 
 #include <svx/AccessibleShape.hxx>
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
+namespace com::sun::star::drawing { class XDrawPage; }
 namespace accessibility { class AccessibleShapeTreeInfo; }
 
 namespace accessibility {
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index 7ad8015b685c..916ccd3d66cf 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -29,10 +29,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 class SdPage;
-
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
 namespace accessibility {
 
diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index b2278a20ac47..f19b7cd14501 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -33,9 +33,7 @@
 
 #include <memory>
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
 namespace accessibility {
 
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index f4ad577093c1..71d61908152b 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -35,10 +35,10 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawSubController; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XModuleController; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XLayer; } } } }
+namespace com::sun::star::drawing { class XDrawSubController; }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::drawing::framework { class XModuleController; }
+namespace com::sun::star::drawing { class XLayer; }
 namespace osl { class Mutex; }
 
 class SdPage;
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index ffd39eda94f6..e5e6b94b645a 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -30,9 +30,9 @@
 #include <unotools/options.hxx>
 #include <sddllapi.h>
 
-namespace svx { namespace sidebar { class SelectionChangeHandler; } }
-namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } }
-namespace com { namespace sun { namespace star { namespace scanner { class XScannerManager2; } } } }
+namespace svx::sidebar { class SelectionChangeHandler; }
+namespace com::sun::star::lang { class XEventListener; }
+namespace com::sun::star::scanner { class XScannerManager2; }
 
 class Outliner;
 class SdPage;
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index f1578bed321b..df9a64b8c03b 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -115,7 +115,7 @@ enum class EventMultiplexerEventId
     EditModeMaster,
 };
 
-namespace sd { namespace tools {
+namespace sd::tools {
 
 class EventMultiplexerEvent
 {
@@ -172,7 +172,7 @@ private:
     rtl::Reference<Implementation> mpImpl;
 };
 
-} } // end of namespace ::sd::tools
+} // end of namespace ::sd::tools
 
 #endif
 
diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx
index d2f7d879c1b1..a40fa3d66bfa 100644
--- a/sd/source/ui/inc/FormShellManager.hxx
+++ b/sd/source/ui/inc/FormShellManager.hxx
@@ -30,7 +30,7 @@ class VclWindowEvent;
 class FmFormShell;
 namespace vcl { class Window; }
 
-namespace sd { namespace tools { class EventMultiplexerEvent; } }
+namespace sd::tools { class EventMultiplexerEvent; }
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index b32f72398873..68aa3424a1ac 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -33,9 +33,9 @@ class SfxProgress;
 struct PasteOrDropInfos;
 class EditView;
 
-namespace sd { namespace tools {
-class EventMultiplexerEvent;
-} }
+namespace sd::tools {
+    class EventMultiplexerEvent;
+}
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index 300f7d7da068..a25a93009aa0 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -19,8 +19,8 @@
 #include <sddllapi.h>
 
 namespace osl { class Mutex; }
-namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowController; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::presentation { class XSlideShowController; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
 /**
 * The port for use for the main communication between LibO and remote control app.
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 414febe61ef8..3c27b1a08fef 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -24,10 +24,7 @@
 #include <cppuhelper/basemutex.hxx>
 
 class SdXImpressDocument;
-
-namespace com { namespace sun { namespace star { namespace drawing {
-class XLayer;
-} } } }
+namespace com::sun::star::drawing { class XLayer; }
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index d0dfe14ac25c..d84f0b9f241c 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -23,10 +23,8 @@
 #include "DrawSubController.hxx"
 #include <cppuhelper/basemutex.hxx>
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace sd::slidesorter { class SlideSorter; }
+namespace com::sun::star::drawing { class XDrawPage; }
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 8b83e8cf9f3c..7dec0c7cd6d0 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -26,7 +26,7 @@
 #include <memory>
 
 namespace vcl { class Window; }
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com::sun::star::frame { class XController; }
 namespace rtl { template <class reference_type> class Reference; }
 
 namespace sd {
@@ -36,22 +36,20 @@ class Window;
 class FuPoor;
 }
 
-namespace sd { namespace slidesorter { namespace model {
-class SlideSorterModel;
-} } }
+namespace sd::slidesorter::model { class SlideSorterModel; }
 
-namespace sd { namespace slidesorter { namespace view {
-class SlideSorterView;
-class Theme;
-} } }
+namespace sd::slidesorter::view {
+    class SlideSorterView;
+    class Theme;
+}
 
-namespace sd { namespace slidesorter { namespace controller {
-class SlideSorterController;
-class SlotManager;
-class Properties;
-} } }
+namespace sd::slidesorter::controller {
+    class SlideSorterController;
+    class SlotManager;
+    class Properties;
+}
 
-namespace sd { namespace slidesorter {
+namespace sd::slidesorter {
 
 /** Show previews for all the slides in a document and allow the user to
     insert or delete slides and modify the order of the slides.
@@ -246,7 +244,7 @@ private:
     void ReleaseListeners();
 };
 
-} } // end of namespace ::sd::slidesorter
+} // end of namespace ::sd::slidesorter
 
 #endif
 
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 43f94f4d60cd..7bc7a20cb201 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -27,11 +27,9 @@
 #include <memory>
 #include <vector>
 
-namespace sd { namespace slidesorter { namespace controller {
-class SlotManager;
-} } }
+namespace sd::slidesorter::controller { class SlotManager; }
 
-namespace sd { namespace slidesorter {
+namespace sd::slidesorter {
 
 class SlideSorter;
 
@@ -231,7 +229,7 @@ private:
 
 typedef std::shared_ptr<SlideSorterViewShell::PageSelection> SharedPageSelection;
 
-} } // end of namespace ::sd::slidesorter
+} // end of namespace ::sd::slidesorter
 
 #endif
 
diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx
index f60aea41d4bf..4665206d7bf6 100644
--- a/sd/source/ui/inc/SlideTransitionPane.hxx
+++ b/sd/source/ui/inc/SlideTransitionPane.hxx
@@ -30,9 +30,9 @@
 
 class SdDrawDocument;
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawView; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace sd { namespace tools { class EventMultiplexerEvent; } }
+namespace com::sun::star::drawing { class XDrawView; }
+namespace com::sun::star::frame { class XModel; }
+namespace sd::tools { class EventMultiplexerEvent; }
 
 namespace sd
 {
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 405070f0c0ce..3a8d2488b4fd 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -28,14 +28,12 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace ucb {
-class XContent;
-class XCommandEnvironment;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace sdbc {
-class XResultSet;
-} } } }
+namespace com::sun::star::ucb {
+    class XContent;
+    class XCommandEnvironment;
+}
+
+namespace com::sun::star::sdbc { class XResultSet; }
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index 8a9603e76389..b6e8dc7d2b92 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -28,10 +28,7 @@
 
 class SdrView;
 namespace sd { class ViewShell; }
-
-namespace sd { namespace tools {
-class EventMultiplexer;
-} }
+namespace sd::tools { class EventMultiplexer; }
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index fd551dc298a5..47c71d0147c3 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -43,7 +43,7 @@ namespace weld
     class Window;
 }
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawSubController; } } } }
+namespace com::sun::star::drawing { class XDrawSubController; }
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 4e4871186d3c..bf8e9990a64d 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -27,9 +27,9 @@
 class SdDrawDocument;
 class SfxRequest;
 
-namespace sd { namespace tools {
+namespace sd::tools {
 class EventMultiplexer;
-} }
+}
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index 92b8296a208f..534eb215dd2b 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -31,10 +31,10 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { struct ConfigurationChangeEvent; } } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
+namespace com::sun::star::drawing::framework { struct ConfigurationChangeEvent; }
+namespace com::sun::star::frame { class XController; }
 namespace vcl { class Window; }
 
 namespace sd {
diff --git a/sd/source/ui/inc/createtableobjectbar.hxx b/sd/source/ui/inc/createtableobjectbar.hxx
index 583efcc6aab1..310e30c0d045 100644
--- a/sd/source/ui/inc/createtableobjectbar.hxx
+++ b/sd/source/ui/inc/createtableobjectbar.hxx
@@ -28,10 +28,10 @@ namespace sd {
     class ViewShell;
 }
 
-namespace sd { namespace ui { namespace table {
+namespace sd::ui::table {
 
 SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView );
 
-} } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx
index 17dcad0ab9e0..26b6798206d3 100644
--- a/sd/source/ui/inc/diactrl.hxx
+++ b/sd/source/ui/inc/diactrl.hxx
@@ -23,7 +23,7 @@
 #include <svtools/InterimItemWindow.hxx>
 #include <sfx2/tbxctrl.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 class SfxUInt16Item;
 
 // SdPagesField:
diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx
index d49295133d34..aee3924d3d44 100644
--- a/sd/source/ui/inc/facreg.hxx
+++ b/sd/source/ui/inc/facreg.hxx
@@ -23,9 +23,9 @@
 #include <sal/config.h>
 #include <sfx2/sfxmodelfactory.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang { class XMultiServiceFactory; }
-} } }
+}
 
 css::uno::Reference< css::uno::XInterface > SdDrawingDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags );
 /// @throws css::uno::RuntimeException
diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx
index 3699c1ac431d..3aef7fbb794e 100644
--- a/sd/source/ui/inc/framework/Configuration.hxx
+++ b/sd/source/ui/inc/framework/Configuration.hxx
@@ -28,10 +28,10 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace util { class XCloneable; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationControllerBroadcaster; } } } } }
+namespace com::sun::star::util { class XCloneable; }
+namespace com::sun::star::drawing::framework { class XConfigurationControllerBroadcaster; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XConfiguration,
@@ -179,7 +179,7 @@ bool AreConfigurationsEquivalent (
         const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration1,
         const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration2);
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 3b0bfd669b2a..2c92edfa2930 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -30,12 +30,12 @@
 #include <memory>
 
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationChangeRequest; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { struct ConfigurationChangeEvent; } } } } }
+namespace com::sun::star::drawing::framework { class XConfiguration; }
+namespace com::sun::star::drawing::framework { class XConfigurationChangeRequest; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
+namespace com::sun::star::drawing::framework { struct ConfigurationChangeEvent; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XConfigurationController,
@@ -177,7 +177,7 @@ private:
     void ThrowIfDisposed () const;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/DrawModule.hxx b/sd/source/ui/inc/framework/DrawModule.hxx
index 0870c963e637..24be5293ef24 100644
--- a/sd/source/ui/inc/framework/DrawModule.hxx
+++ b/sd/source/ui/inc/framework/DrawModule.hxx
@@ -22,10 +22,10 @@
 
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** The task of this module is to instantiate all modules that belong to the
     Draw application.
@@ -37,7 +37,7 @@ public:
         css::uno::Reference<css::frame::XController> const & rxController);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index ece9b4c35511..fe964e2eb015 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -28,17 +28,17 @@
 #include <map>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XView; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { struct ConfigurationChangeEvent; } } } } }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::drawing::framework { class XResourceId; }
+namespace com::sun::star::drawing::framework { class XView; }
+namespace com::sun::star::drawing::framework { struct ConfigurationChangeEvent; }
 
 namespace sd {
 class ViewShellBase;
 }
 
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** The FrameworkHelper is a convenience class that simplifies the
     access to the drawing framework.
@@ -348,7 +348,7 @@ private:
     void disposing (const css::lang::EventObject& rEventObject);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/ImpressModule.hxx b/sd/source/ui/inc/framework/ImpressModule.hxx
index b8d51d0cfb06..5f46ab0d3944 100644
--- a/sd/source/ui/inc/framework/ImpressModule.hxx
+++ b/sd/source/ui/inc/framework/ImpressModule.hxx
@@ -22,10 +22,10 @@
 
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** The task of this module is to instantiate all modules that belong to the
     Impress application.
@@ -37,7 +37,7 @@ public:
         css::uno::Reference<css::frame::XController> const & rxController);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 40d998013fae..850f84d6dbc0 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -28,10 +28,10 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::uno { class XComponentContext; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XModuleController,
@@ -114,7 +114,7 @@ private:
     void ProcessStartupService (const ::std::vector<css::uno::Any>& rValues);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index 29efeb5d9417..1594299c8b3d 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -29,7 +29,7 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/window.hxx>
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
       css::drawing::framework::XPane,
@@ -138,7 +138,7 @@ protected:
     void ThrowIfDisposed() const;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index d23ad35c0e2d..aee247e0c73f 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -26,9 +26,9 @@
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
 #include <cppuhelper/compbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com::sun::star::frame { class XController; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XResourceFactory,
@@ -77,7 +77,7 @@ private:
     void ThrowIfDisposed() const;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/PresentationModule.hxx b/sd/source/ui/inc/framework/PresentationModule.hxx
index 05919b0987da..a8f3fcc3ded3 100644
--- a/sd/source/ui/inc/framework/PresentationModule.hxx
+++ b/sd/source/ui/inc/framework/PresentationModule.hxx
@@ -22,10 +22,10 @@
 
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 /** The task of this module is to instantiate all modules that belong to the
     fullscreen presentation.
@@ -37,7 +37,7 @@ public:
         css::uno::Reference<css::frame::XController> const & rxController);
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx
index 34043890d6c6..97af420b042f 100644
--- a/sd/source/ui/inc/framework/ResourceId.hxx
+++ b/sd/source/ui/inc/framework/ResourceId.hxx
@@ -31,10 +31,10 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace util { class XURLTransformer; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class WeakReference; } } } }
+namespace com::sun::star::util { class XURLTransformer; }
+namespace com::sun::star::uno { template <class interface_type> class WeakReference; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakImplHelper <
     css::drawing::framework::XResourceId,
@@ -209,7 +209,7 @@ private:
     void ParseResourceURL();
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index 8e8c5bd3ec37..f70eaad55d3d 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -31,10 +31,10 @@
 #include <memory>
 
 namespace sd { class ViewShell; }
-namespace sd { namespace slidesorter { class SlideSorterViewShell; } }
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
+namespace sd::slidesorter { class SlideSorterViewShell; }
+namespace com::sun::star::awt { class XWindow; }
 
-namespace sd { namespace framework {
+namespace sd::framework {
 
 typedef ::cppu::WeakComponentImplHelper    <   css::lang::XUnoTunnel
                                             ,   css::awt::XWindowListener
@@ -129,7 +129,7 @@ private:
     css::uno::Reference<css::awt::XWindow >                             mxWindow;
 };
 
-} } // end of namespace sd::framework
+} // end of namespace sd::framework
 
 #endif
 
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx
index 0a1ffc073137..75a3b1110ffd 100644
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@@ -22,7 +22,7 @@
 
 #include "fudraw.hxx"
 
-namespace com { namespace sun { namespace star { namespace media { class XPlayer; } } } }
+namespace com::sun::star::media { class XPlayer; }
 
 class SdrHdl;
 class SdrObject;
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 6156fb44942d..4b89a7cf3083 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -34,8 +34,8 @@ class SdHtmlAttrPreview;
 class SdPublishingDesign;
 class ButtonSet;
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 // *********************************************************************
 // Html-Export Autopilot
diff --git a/sd/source/ui/inc/registerinterfaces.hxx b/sd/source/ui/inc/registerinterfaces.hxx
index cdf037e60df1..d8ebb726ee35 100644
--- a/sd/source/ui/inc/registerinterfaces.hxx
+++ b/sd/source/ui/inc/registerinterfaces.hxx
@@ -23,11 +23,11 @@
 #include <sal/config.h>
 #include <sfx2/module.hxx>
 
-namespace sd { namespace ui { namespace table {
+namespace sd::ui::table {
 
 void RegisterInterfaces( SfxModule* pMod );
 
-} } }
+}
 
 #endif
 
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 6b23e0568a28..90a45ac826ab 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -34,16 +34,14 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star {
-
+namespace com::sun::star {
     namespace drawing {
         class XDrawPage;
     }
     namespace animations {
         class XAnimationNode;
     }
-} } }
-
+}
 class SdDrawDocument;
 class KeyEvent;
 class OutputDevice;
diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx
index 25d4cae9c34a..fe5b7ab18826 100644
--- a/sd/source/ui/inc/tools/AsynchronousCall.hxx
+++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx
@@ -25,7 +25,7 @@
 #include <memory>
 #include <functional>
 
-namespace sd { namespace tools {
+namespace sd::tools {
 
 /** Store a function object and execute it asynchronous.
 
@@ -74,7 +74,7 @@ private:
     DECL_LINK(TimerCallback,Timer*,void);
 };
 
-} } // end of namespace ::sd::tools
+} // end of namespace ::sd::tools
 
 #endif
 
diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx b/sd/source/ui/inc/tools/AsynchronousTask.hxx
index 897f2cdecd63..e6244b141f3c 100644
--- a/sd/source/ui/inc/tools/AsynchronousTask.hxx
+++ b/sd/source/ui/inc/tools/AsynchronousTask.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_TOOLS_ASYNCHRONOUSTASK_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_TOOLS_ASYNCHRONOUSTASK_HXX
 
-namespace sd { namespace tools {
+namespace sd::tools {
 
 /** Interface for the asynchronous execution of a task.  This interface
     allows a controller to run the task either timer based with a fixed
@@ -45,7 +45,7 @@ protected:
     ~AsynchronousTask() {}
 };
 
-} } // end of namespace ::sd::tools
+} // end of namespace ::sd::tools
 
 #endif
 
diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
index 987f20cbb967..718147354d4d 100644
--- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx
+++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
@@ -26,12 +26,12 @@
 #include <vector>
 #include <functional>
 
-namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::container { class XHierarchicalNameAccess; }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::uno { class XComponentContext; }
 
-namespace sd { namespace tools {
+namespace sd::tools {
 
 /** This class gives access to the configuration.  Create an object of this
     class for one node of the configuration.  This will be the root node.
@@ -140,7 +140,7 @@ private:
         const WriteMode eMode);
 };
 
-} } // end of namespace sd::tools
+} // end of namespace sd::tools
 
 #endif
 
diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx
index 54234d09df99..dac74f9c45f1 100644
--- a/sd/source/ui/inc/tools/IdleDetection.hxx
+++ b/sd/source/ui/inc/tools/IdleDetection.hxx
@@ -24,7 +24,7 @@
 
 namespace vcl { class Window; }
 
-namespace sd { namespace tools {
+namespace sd::tools {
     enum class IdleState {
         /** When GetIdleState() returns this value, then the system is idle.
         */
@@ -48,12 +48,12 @@ namespace sd { namespace tools {
         */
         WindowPainting = 0x0008,
     };
-} } // end of namespace ::sd::tools
+} // end of namespace ::sd::tools
 namespace o3tl {
     template<> struct typed_flags<::sd::tools::IdleState> : is_typed_flags<::sd::tools::IdleState, 0x0f> {};
 }
 
-namespace sd { namespace tools {
+namespace sd::tools {
 
 /** Detect whether the system is idle and some time consuming operation may
     be carried out.  This class distinguishes between different states of
@@ -85,7 +85,7 @@ private:
     static IdleState CheckWindowPainting (const vcl::Window& rWindow);
 };
 
-} } // end of namespace ::sd::tools
+} // end of namespace ::sd::tools
 
 #endif
 
diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx
index 4285b9d70918..b9e936da0e97 100644
--- a/sd/source/ui/inc/tools/PropertySet.hxx
+++ b/sd/source/ui/inc/tools/PropertySet.hxx
@@ -26,7 +26,7 @@
 #include <map>
 #include <memory>
 
-namespace sd { namespace tools {
+namespace sd::tools {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::beans::XPropertySet
@@ -110,7 +110,7 @@ private:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sd::tools
+} // end of namespace ::sd::tools
 
 #endif
 
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 00fe6aa21622..5d401a98a456 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -24,8 +24,8 @@
 #include <sal/types.h>
 #include <o3tl/deleter.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::uno { class XInterface; }
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx
index b644254e1315..94d4e2216be2 100644
--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@@ -25,12 +25,12 @@
 #include <cppuhelper/compbase.hxx>
 #include <tools/link.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XDispatch; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XDispatchProvider; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XStatusListener; } } } }
-namespace com { namespace sun { namespace star { namespace frame { struct FeatureStateEvent; } } } }
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::frame { class XDispatchProvider; }
+namespace com::sun::star::frame { class XStatusListener; }
+namespace com::sun::star::frame { struct FeatureStateEvent; }
 
-namespace sd { namespace tools {
+namespace sd::tools {
 
 typedef cppu::WeakComponentImplHelper<
     css::frame::XStatusListener
@@ -137,7 +137,7 @@ private:
             const css::util::URL& rURL) const;
 };
 
-} } // end of namespace ::sd::tools
+} // end of namespace ::sd::tools
 
 #endif
 
diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
index 95dedec19a15..507451631e59 100644
--- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
+++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
@@ -24,7 +24,7 @@
 
 #include <memory>
 
-namespace sd { namespace tools {
+namespace sd::tools {
 
 class AsynchronousTask;
 
@@ -85,7 +85,7 @@ private:
     DECL_LINK(TimerCallback, Timer *, void);
 };
 
-} } // end of namespace ::sd::tools
+} // end of namespace ::sd::tools
 
 #endif
 
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index b320abda4912..f27ed3c21c7d 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -46,9 +46,9 @@
 #include <cppuhelper/weakref.hxx>
 #include <sddllapi.h>
 
-namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class XForbiddenCharacters; } } } }
-namespace com { namespace sun { namespace star { namespace presentation { class XPresentation; } } } }
+namespace com::sun::star::container { class XNameContainer; }
+namespace com::sun::star::i18n { class XForbiddenCharacters; }
+namespace com::sun::star::presentation { class XPresentation; }
 
 class SdDrawDocument;
 class SdPage;
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index 4d4279bff245..25c527c8c2c9 100644
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -29,10 +29,10 @@
 #include <cppuhelper/implbase.hxx>
 #include <editeng/editdata.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
-namespace com { namespace sun { namespace star { namespace text { class XTextRange; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XSearchDescriptor; } } } }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::text { class XTextRange; }
+namespace com::sun::star::util { class XSearchDescriptor; }
 
 class SvxItemPropertySet;
 class SdUnoSearchReplaceDescriptor;
diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx
index 3189e1cdaa47..0fda1b28cd6f 100644
--- a/sd/source/ui/inc/view/viewoverlaymanager.hxx
+++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx
@@ -27,7 +27,7 @@
 #include <vector>
 
 namespace sd { class SmartTag; }
-namespace sd { namespace tools { class EventMultiplexerEvent; } }
+namespace sd::tools { class EventMultiplexerEvent; }
 namespace sd { class ViewShellBase; }
 struct ImplSVEvent;
 
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index 653e991f8fc1..97da675fb858 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -24,11 +24,11 @@
 #include <tools/link.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace rendering { class XSpriteCanvas; } } } }
+namespace com::sun::star::rendering { class XSpriteCanvas; }
 
 struct ImplSVEvent;
 
-namespace sd { namespace presenter {
+namespace sd::presenter {
 
 /** Each UpdateRequester handles update requests (calls to
     XCanvas::updateScreen()) for one shared canvas (a canvas that has one or
@@ -64,7 +64,7 @@ private:
     DECL_LINK(Callback, void*, void);
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index 557d65cbe6f0..3aaa7ff2402b 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -29,11 +29,11 @@
 #include <cppuhelper/compbase.hxx>
 #include <memory>
 
-namespace sd { namespace presenter { class CanvasUpdateRequester; } }
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace geometry { struct AffineMatrix2D; } } } }
+namespace sd::presenter { class CanvasUpdateRequester; }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::geometry { struct AffineMatrix2D; }
 
-namespace sd { namespace presenter {
+namespace sd::presenter {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::rendering::XSpriteCanvas,
@@ -318,7 +318,7 @@ private:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index 837c04abdb42..2dbc74014cef 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -25,9 +25,9 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
-namespace sd { namespace presenter {
+namespace sd::presenter {
 
 typedef ::cppu::WeakComponentImplHelper<
     css::lang::XInitialization,
@@ -91,7 +91,7 @@ private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index 3388d4ac3382..2a10a8d2628b 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -27,9 +27,9 @@
 #include <cppuhelper/basemutex.hxx>
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace cache { class PageCache; } } }
+namespace sd::slidesorter::cache { class PageCache; }
 
-namespace sd { namespace presenter {
+namespace sd::presenter {
 
 typedef ::cppu::WeakComponentImplHelper<
     css::lang::XInitialization,
@@ -95,7 +95,7 @@ private:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index 9773807c829f..8f0eb5167805 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <memory>
 
-namespace sd { namespace presenter {
+namespace sd::presenter {
 
 typedef ::cppu::ImplInheritanceHelper <
     tools::PropertySet,
@@ -67,7 +67,7 @@ private:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx
index fcb42fd8f166..98afe72b7e41 100644
--- a/sd/source/ui/presenter/SlideRenderer.hxx
+++ b/sd/source/ui/presenter/SlideRenderer.hxx
@@ -28,9 +28,9 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com::sun::star::drawing { class XDrawPage; }
 
-namespace sd { namespace presenter {
+namespace sd::presenter {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::XSlideRenderer,
@@ -93,7 +93,7 @@ private:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sd/source/ui/remotecontrol/Communicator.hxx b/sd/source/ui/remotecontrol/Communicator.hxx
index 4026808e68ac..1c7bd88d9a3b 100644
--- a/sd/source/ui/remotecontrol/Communicator.hxx
+++ b/sd/source/ui/remotecontrol/Communicator.hxx
@@ -14,8 +14,8 @@
 #include <rtl/ref.hxx>
 #include <salhelper/thread.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowController; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::presentation { class XSlideShowController; }
 namespace sd { struct IBluetoothSocket; }
 
 namespace sd
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx
index 4b2e9ff51a8a..0943ef14b4f7 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.hxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx
@@ -12,7 +12,7 @@
 #include <vcl/timer.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowController; } } } }
+namespace com::sun::star::presentation { class XSlideShowController; }
 namespace sd { class Transmitter; }
 
 namespace sd
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index ad75d6e1cd18..359ceac9ceb6 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -17,7 +17,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowController; } } } }
+namespace com::sun::star::presentation { class XSlideShowController; }
 namespace sd { class Communicator; }
 namespace sd { class Transmitter; }
 
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
index b3579159d8e8..ff94edddf0b1 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
@@ -24,7 +24,7 @@
 
 #include <memory>
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Show a list of all available master pages so that the user can assign
     them to the document.
@@ -75,7 +75,7 @@ private:
     using MasterPagesSelector::Fill;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index 37761b4b9904..87244b530f81 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -25,9 +25,9 @@
 #include "MasterPagesSelector.hxx"
 
 
-namespace sd { namespace tools { class EventMultiplexerEvent; } }
+namespace sd::tools { class EventMultiplexerEvent; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Show the master pages currently used by a SdDrawDocument.
 */
@@ -75,7 +75,7 @@ private:
     DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent&, void);
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
index 7628498c33b5..0e03fb399600 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
@@ -21,9 +21,9 @@
 
 #include "PanelBase.hxx"
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class CustomAnimationPanel
     : public PanelBase
@@ -47,7 +47,7 @@ private:
     css::uno::Reference<css::frame::XFrame>     mxFrame;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx b/sd/source/ui/sidebar/DocumentHelper.hxx
index c655611774d4..5f34f66718b2 100644
--- a/sd/source/ui/sidebar/DocumentHelper.hxx
+++ b/sd/source/ui/sidebar/DocumentHelper.hxx
@@ -27,7 +27,7 @@
 class SdDrawDocument;
 class SdPage;
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** A collection of methods supporting the handling of master pages.
 */
@@ -101,7 +101,7 @@ private:
         SdPage* pPage);
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx
index 60994662fb75..0220d870927e 100644
--- a/sd/source/ui/sidebar/IDisposable.hxx
+++ b/sd/source/ui/sidebar/IDisposable.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_IDISPOSABLE_HXX
 #define INCLUDED_SD_SOURCE_UI_SIDEBAR_IDISPOSABLE_HXX
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class IDisposable
 {
@@ -27,7 +27,7 @@ public:
     virtual ~IDisposable();
 };
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/ISidebarReceiver.hxx b/sd/source/ui/sidebar/ISidebarReceiver.hxx
index 94af1109aa2f..3a67d650bca2 100644
--- a/sd/source/ui/sidebar/ISidebarReceiver.hxx
+++ b/sd/source/ui/sidebar/ISidebarReceiver.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_ISIDEBARRECEIVER_HXX
 #define INCLUDED_SD_SOURCE_UI_SIDEBAR_ISIDEBARRECEIVER_HXX
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class ISidebarReceiver
 {
@@ -27,7 +27,7 @@ public:
     virtual ~ISidebarReceiver();
 };
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index 92de46a93b9c..4981a919a86e 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -29,8 +29,8 @@
 #include <sfx2/request.hxx>
 #include <xmloff/autolayout.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XStatusListener; } } } }
-namespace com { namespace sun { namespace star { namespace ui { class XSidebar; } } } }
+namespace com::sun::star::frame { class XStatusListener; }
+namespace com::sun::star::ui { class XSidebar; }
 
 
 namespace sd {
@@ -38,11 +38,9 @@ class DrawDocShell;
 class ViewShellBase;
 }
 
-namespace sd { namespace tools {
-class EventMultiplexerEvent;
-} }
+namespace sd::tools { class EventMultiplexerEvent; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class LayoutValueSet;
 
@@ -172,7 +170,7 @@ private:
     DECL_LINK(OnMenuItemSelected, Menu*, bool);
 };
 
-} } // end of namespace ::sd::toolpanel
+} // end of namespace ::sd::toolpanel
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index 107622ca74c5..0c7c63e06a95 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -26,7 +26,7 @@
 
 class SdPage;
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class MasterPageDescriptor;
 class MasterPageContainerChangeEvent;
@@ -183,7 +183,7 @@ public:
     MasterPageContainer::Token maChildToken;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx
index 66b4bfb8620a..00b49d66d633 100644
--- a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx
@@ -30,7 +30,7 @@ class TemplateScanner;
 class TemplateEntry;
 }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Fill a MasterPageContainer with information about the available master
     pages.  These are provided by one default page and from the existing
@@ -86,7 +86,7 @@ private:
     State AddTemplate();
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
index da480cb1ac10..d03eaf265062 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
@@ -29,7 +29,7 @@ class SdPage;
 namespace sd { class PreviewRenderer; }
 namespace sd { class DrawDocShell; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Interface for a provider of page objects.  It is used by the
     MasterPageDescriptor to create master page objects on demand.
@@ -161,7 +161,7 @@ private:
     SdPage* mpPage;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index 5e3d9840b38f..584c372e92fa 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -27,7 +27,7 @@
 
 #include <memory>
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** The queue stores and processes all requests from a MasterPageContainer
     for the creation of previews.
@@ -127,7 +127,7 @@ private:
     DECL_LINK(DelayedPreviewCreation, Timer *, void);
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index 3881a0af8337..05e4fb58b5fe 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -26,7 +26,7 @@
 namespace sd { class PreviewRenderer; }
 class SdDrawDocument;
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class PageObjectProvider;
 class PreviewProvider;
@@ -227,7 +227,7 @@ public:
 
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 266b5dd0a5c0..a406f3bc9a99 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -30,7 +30,7 @@
 
 #include <osl/mutex.hxx>
 
-namespace com { namespace sun { namespace star { namespace ui { class XSidebar; } } } }
+namespace com::sun::star::ui { class XSidebar; }
 class MouseEvent;
 class SdDrawDocument;
 class SdPage;
@@ -39,7 +39,7 @@ namespace sd {
 class ViewShellBase;
 }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Base class of a menu that lets the user select from a list of
     templates or designs that are loaded from files.
@@ -179,7 +179,7 @@ private:
         MasterPageContainer::Token aToken);
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx
index 76d7f27716b4..059ab43cf1a7 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.hxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx
@@ -26,7 +26,7 @@ class SdNavigatorWin;
 class SfxBindings;
 namespace sd { class ViewShellBase; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Present the navigator as control that can be displayed inside the
     sidebar.
@@ -61,7 +61,7 @@ private:
     void UpdateNavigator();
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/PageMarginUtils.hxx b/sd/source/ui/sidebar/PageMarginUtils.hxx
index 7061a11f9a6a..592ac1139f78 100644
--- a/sd/source/ui/sidebar/PageMarginUtils.hxx
+++ b/sd/source/ui/sidebar/PageMarginUtils.hxx
@@ -26,7 +26,7 @@
 #define SDPAGE_WIDE_VALUE3     1590
 #define SDPAGE_UNIT_THRESHOLD  5
 
-namespace sd { namespace sidebar{
+namespace sd::sidebar{
 
 bool IsNone( const long nPageLeftMargin, const long nPageRightMargin,
                const long nPageTopMargin, const long nPageBottomMargin )
@@ -153,6 +153,6 @@ void SetWide( long& nPageLeftMargin, long& nPageRightMargin,
     nPageTopMargin = SDPAGE_WIDE_VALUE1;
     nPageBottomMargin = SDPAGE_WIDE_VALUE1;
 }
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx
index 2ffbe366a46d..835dc74bda4d 100644
--- a/sd/source/ui/sidebar/PanelBase.hxx
+++ b/sd/source/ui/sidebar/PanelBase.hxx
@@ -30,7 +30,7 @@ namespace sd {
     class ViewShellBase;
 }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class PanelBase
     : public Control,
@@ -62,7 +62,7 @@ private:
     bool ProvideWrappedControl();
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index e42fc641217a..9588cc309e6a 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/ui/XUIElementFactory.hpp>
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::ui::XUIElementFactory
@@ -49,7 +49,7 @@ public:
         const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx
index 915c822393c0..f489989479a4 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.hxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.hxx
@@ -22,7 +22,7 @@
 
 #include <svtools/valueset.hxx>
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Adapt the svtools valueset to the needs of the master page controls.
 */
@@ -56,7 +56,7 @@ private:
     sal_uInt16 CalculateRowCount (sal_uInt16 nColumnCount) const;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index 923e2ab569bd..bb4197951268 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -22,7 +22,7 @@
 
 #include "MasterPagesSelector.hxx"
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Show the recently used master pages (that are not currently used).
 */
@@ -70,7 +70,7 @@ private:
     virtual void LateInit() override;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index ec98cc1f3147..f1d90d19e3c7 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -30,7 +30,7 @@ namespace sd {
 class MasterPageObserverEvent;
 }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** This singleton holds a list of the most recently used master pages.
 */
@@ -121,7 +121,7 @@ private:
     void ResolveList();
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 1b368c043849..c4b91513700d 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -30,7 +30,7 @@
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
 
 namespace sd { class ViewShellBase; }
-namespace sd { namespace tools { class EventMultiplexerEvent; } }
+namespace sd::tools { class EventMultiplexerEvent; }
 
 class ColorListBox;
 class SvxPageItem;
@@ -44,7 +44,7 @@ class XFillHatchItem;
 
 static const long MINBODY = 284;
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class SlideBackground :
     public PanelLayout,
@@ -180,7 +180,7 @@ private:
     static FieldUnit GetCurrentUnit(SfxItemState eState, const SfxPoolItem* pState);
 };
 
-}}
+}
 
 #endif
 
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
index bf5af5213d7c..fd04a0d60df3 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
@@ -21,9 +21,9 @@
 
 #include "PanelBase.hxx"
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class SlideTransitionPanel
     : public PanelBase
@@ -47,7 +47,7 @@ private:
     css::uno::Reference<css::frame::XFrame> mxFrame;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/TableDesignPanel.hxx b/sd/source/ui/sidebar/TableDesignPanel.hxx
index 0bcea51d03a6..7a2f15832fc9 100644
--- a/sd/source/ui/sidebar/TableDesignPanel.hxx
+++ b/sd/source/ui/sidebar/TableDesignPanel.hxx
@@ -21,7 +21,7 @@
 
 #include "PanelBase.hxx"
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class TableDesignPanel
     : public PanelBase
@@ -41,7 +41,7 @@ protected:
         ViewShellBase& rViewShellBase) override;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx
index 44ba3eee7f68..d7344890d6e4 100644
--- a/sd/source/ui/slideshow/PaneHider.hxx
+++ b/sd/source/ui/slideshow/PaneHider.hxx
@@ -22,8 +22,8 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
+namespace com::sun::star::drawing::framework { class XConfiguration; }
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
 
 namespace sd {
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 43a3823f7897..b3c604bc97b3 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -38,8 +38,8 @@
 
 #include <slideshow.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace media { class XPlayer; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::media { class XPlayer; }
 namespace sd { class DrawDocShell; }
 namespace sd { class ViewShell; }
 
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 602f2e025532..4ad599b72184 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -32,11 +32,11 @@
 
 #include <slideshow.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt { class XPointer; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XWindowPeer; } } } }
-namespace com { namespace sun { namespace star { namespace awt { struct WindowEvent; } } } }
-namespace com { namespace sun { namespace star { namespace rendering { class XSpriteCanvas; } } } }
+namespace com::sun::star::awt { class XPointer; }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::awt { class XWindowPeer; }
+namespace com::sun::star::awt { struct WindowEvent; }
+namespace com::sun::star::rendering { class XSpriteCanvas; }
 class SdDrawDocument;
 
 namespace sd
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index e1a2554b4c26..0eecd4c4c05a 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -26,7 +26,7 @@ class SdrPage;
 #include <osl/mutex.hxx>
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 class CacheCompactor;
 class BitmapCompressor;
@@ -207,7 +207,7 @@ private:
     void UpdateCacheSize (const CacheEntry& rKey, CacheOperation eOperation);
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
index 678f20bfa54d..135007a575b8 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
@@ -25,7 +25,7 @@
 
 class BitmapEx;
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 class BitmapReplacement;
 
@@ -135,7 +135,7 @@ public:
     virtual bool IsLossless() const override;
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx
index 7d89fdcc771d..e179ae0dbd98 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx
@@ -25,7 +25,7 @@
 class SdPage;
 class Size;
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 /** This factory class creates preview bitmaps for page objects.  It is
     merely an adapter for the PreviewRenderer.
@@ -45,7 +45,7 @@ private:
     PreviewRenderer maRenderer;
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
index bccb196c2d78..a4184301c192 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
@@ -24,7 +24,7 @@
 #include <vcl/timer.hxx>
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 class BitmapCache;
 
@@ -83,7 +83,7 @@ private:
     DECL_LINK(CompactionCallback, Timer *, void);
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
index ea7aa971b87d..2c3e1489e36c 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
@@ -24,9 +24,9 @@
 #include <vcl/timer.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
+namespace com::sun::star::container { class XNameAccess; }
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 /** A very simple and easy-to-use access to configuration entries regarding
     the slide sorter cache.
@@ -61,7 +61,7 @@ private:
     DECL_STATIC_LINK(CacheConfiguration, TimerCallback, Timer *, void);
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
index d58010b14085..7ec76d05683f 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
@@ -25,7 +25,7 @@
 
 #include <vcl/bitmapex.hxx>
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 class BitmapCache;
 class QueueProcessor;
@@ -148,7 +148,7 @@ private:
     void ProvideCacheAndProcessor();
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index 64adf09ee07c..c44d2be7f066 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -26,7 +26,7 @@
 
 #include <vcl/timer.hxx>
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 class BitmapCache;
 class RequestQueue;
@@ -93,7 +93,7 @@ private:
         const RequestPriorityClass ePriorityClass);
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx
index ea87133a8f5d..c048a6e5b307 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx
@@ -22,7 +22,7 @@
 
 #include <cache/SlsCacheContext.hxx>
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 class RequestQueue;
 
@@ -34,7 +34,7 @@ public:
         const SharedCacheContext& rpCacheContext);
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx
index 594cc3171b1d..8722d106e14a 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_CACHE_SLSREQUESTPRIORITYCLASS_HXX
 #define INCLUDED_SD_SOURCE_UI_SLIDESORTER_CACHE_SLSREQUESTPRIORITYCLASS_HXX
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 /** Each request for a preview creation has a priority.  This enum defines
     the available priorities.  The special values MIN_CLASS and MAX_CLASS
@@ -40,7 +40,7 @@ enum RequestPriorityClass
     MAX_CLASS = NOT_VISIBLE
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index b6c30586fd5a..9687c1fe09c2 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -27,7 +27,7 @@
 
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 /** The request queue stores requests that are described by the Request
     sorted according to priority class and then priority.
@@ -122,7 +122,7 @@ private:
     int mnMaximumPriority;
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index ac73bf8d9742..9cbe68ad3e32 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -24,11 +24,9 @@
 
 class Point;
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter {  class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** A DragAndDropContext object handles an active drag and drop operation.
     When the mouse is moved from one slide sorter window to another the
@@ -65,7 +63,7 @@ private:
     sal_Int32 mnInsertionIndex;
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index 1268a6a9743d..52c5e404af4d 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -38,15 +38,10 @@ namespace sd {
 class ViewShellBase;
 }
 
-namespace sd { namespace tools {
-class EventMultiplexerEvent;
-} }
+namespace sd::tools { class EventMultiplexerEvent; }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
-
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 typedef cppu::WeakComponentImplHelper<
     css::document::XEventListener,
@@ -166,7 +161,7 @@ private:
     DECL_LINK(EventMultiplexerCallback, tools::EventMultiplexerEvent&, void);
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
index bfc9ad900f6a..16102f22f66c 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
@@ -25,11 +25,11 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { class XInterface; }
 
 class SdrPage;
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 typedef const SdrPage* CacheKey;
 
@@ -91,7 +91,7 @@ public:
 
 typedef std::shared_ptr<CacheContext> SharedCacheContext;
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 5a3f65f53866..d320651e5331 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -26,7 +26,7 @@
 
 class Size;
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 class GenericPageCache;
 
@@ -146,7 +146,7 @@ private:
     std::unique_ptr<GenericPageCache> mpImplementation;
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
index 0a55d13ad9cb..16c4305e5cdc 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
@@ -28,7 +28,7 @@
 class Size;
 class SdrPage;
 
-namespace sd { namespace slidesorter { namespace cache {
+namespace sd::slidesorter::cache {
 
 class BitmapCache;
 
@@ -151,7 +151,7 @@ private:
         const Size& rPreviewSize);
 };
 
-} } } // end of namespace ::sd::slidesorter::cache
+} // end of namespace ::sd::slidesorter::cache
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 7f444ddcee45..44402fd2e47b 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -33,23 +33,15 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace container { class XIndexAccess; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 namespace sd { class FuPoor; }
 namespace sd { class Window; }
 namespace vcl { class Window; }
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
-
-namespace sd { namespace slidesorter { namespace view {
-class SlideSorterView;
-} } }
-
-namespace sd { namespace slidesorter { namespace model {
-class SlideSorterModel;
-} } }
+namespace sd::slidesorter { class SlideSorter; }
+namespace sd::slidesorter::view { class SlideSorterView; }
+namespace sd::slidesorter::model { class SlideSorterModel; }
 
 class CommandEvent;
 class SdPage;
@@ -58,7 +50,7 @@ class SfxRequest;
 class VclSimpleEvent;
 class VclWindowEvent;
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 class Animator;
 class Clipboard;
@@ -307,7 +299,7 @@ private:
     void PostModelChange();
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
index 9af186531936..1af111ffd7c6 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
@@ -26,7 +26,7 @@
 #include <vector>
 
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 class AnimationBezierFunction
 {
@@ -73,7 +73,7 @@ private:
     ::std::vector<double> maY;
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index 20e1f747eb29..5172528c7cd6 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -30,9 +30,9 @@
 #include <memory>
 #include <vector>
 
-namespace sd { namespace slidesorter { class SlideSorter; } }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** Experimental class for simple eye candy animations.
 */
@@ -118,7 +118,7 @@ private:
     void RequestNextFrame();
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index d09c5297ed8f..299012fdb534 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -44,11 +44,9 @@ namespace sd {
 class Window;
 }
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 class SlideSorterController;
 
@@ -207,7 +205,7 @@ private:
     DECL_LINK(ProcessDragFinished, void*, void);
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
index f2b2cdc9258e..d7bcb8e38db5 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
@@ -26,11 +26,9 @@
 
 class SdPage;
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** Manage the current slide.  This includes setting the according flags at
     the PageDescriptor objects and setting the current slide at the main
@@ -108,7 +106,7 @@ private:
     DECL_LINK(SwitchPageCallback, Timer*, void);
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
index 692caa781ded..59d51fc91f33 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
@@ -26,11 +26,9 @@
 #include <tools/link.hxx>
 #include <vector>
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** This class manages the focus of the slide sorter.  There is the focus
     page which is or is not focused.  Initialized to point to the first page
@@ -206,7 +204,7 @@ private:
     void NotifyFocusChangeListeners() const;
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
index b16e3d3e67fd..b12a8800fcdf 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
@@ -24,15 +24,15 @@
 
 #include <view/SlsLayouter.hxx>
 
-namespace sd { namespace slidesorter { class SlideSorter; } }
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter { class SlideSorter; }
+namespace sd::slidesorter::view {
 class InsertAnimator;
 class InsertionIndicatorOverlay;
-} } }
+}
 
 class SdTransferable;
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** Manage the visibility and location of the insertion indicator.  Its
     actual display is controlled by the InsertionIndicatorOverlay.
@@ -134,7 +134,7 @@ private:
     void ForceEnd();
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index f84f8c77ba9d..48065e70aced 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -29,15 +29,10 @@
 
 class SdPage;
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
+namespace sd::slidesorter::model { class SlideSorterModel; }
 
-namespace sd { namespace slidesorter { namespace model {
-class SlideSorterModel;
-} } }
-
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 class SlideSorterController;
 
@@ -214,7 +209,7 @@ private:
     void CheckConsistency() const;
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
index 7f9668bd543b..01579e9a76db 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
@@ -22,7 +22,7 @@
 
 #include <tools/color.hxx>
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** An extensible set of properties used throughout the slide sorter.
 */
@@ -119,7 +119,7 @@ private:
     bool mbIsUIReadOnly;
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 1ab15496a5f4..ae281e6a5641 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -30,9 +30,9 @@
 
 namespace sd { class Window; }
 
-namespace sd { namespace slidesorter { class SlideSorter; } }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** Manage the horizontal and vertical scroll bars.  Listen for events, set
     their sizes, place them in the window, determine their visibilities.
@@ -244,7 +244,7 @@ private:
     void PlaceFiller (const ::tools::Rectangle& aArea);
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 9ffa63bec597..f7a31ea7e4b1 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -24,13 +24,11 @@
 #include <fupoor.hxx>
 #include <memory>
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
 struct AcceptDropEvent;
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 class SlideSorterController;
 
@@ -147,7 +145,7 @@ private:
     void SwitchMode (const std::shared_ptr<ModeHandler>& rpHandler);
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index de65f7fce44d..868dcdaea06e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -27,11 +27,9 @@
 
 class SdPage;
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 class SlideSorterController;
 class SelectionObserver;
@@ -131,7 +129,7 @@ private:
     void DeleteSelectedMasterPages (const ::std::vector<SdPage*>& rSelectedMasterPages);
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index c05815e7240c..119a8d08cbb8 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -24,14 +24,12 @@
 #include <memory>
 #include <vector>
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
 class SdrPage;
 class SdPage;
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** Observe insertions and deletions of pages between calls to
     StartObservation() and EndObservation().  When the later is called
@@ -71,7 +69,7 @@ private:
     ::std::vector<const SdPage*> maInsertedPages;
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index df378315afad..238c10a36ce0 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -27,11 +27,9 @@ class AbstractSvxNameDialog;
 class SfxItemSet;
 class SfxRequest;
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** This manager takes over the work of handling slot calls from the
     controller of the slide sorter.
@@ -96,7 +94,7 @@ private:
     sal_Int32 GetInsertionPosition() const;
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
index 24e383d68cde..7354697f05e1 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
@@ -27,11 +27,9 @@
 #include <vector>
 
 class SdDrawDocument;
-namespace sd { namespace slidesorter {
-class SlideSorterViewShell;
-} }
+namespace sd::slidesorter { class SlideSorterViewShell; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** Represent previews and other information so that they can be
     attached to an existing transferable.
@@ -76,7 +74,7 @@ private:
     virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) override;
 };
 
-} } } // end of namespace ::sd::slidesorter::controller
+} // end of namespace ::sd::slidesorter::controller
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
index a8e1510a49c6..2b7606c8b75e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
@@ -25,9 +25,9 @@
 #include <tools/gen.hxx>
 #include <vector>
 
-namespace sd { namespace slidesorter { class SlideSorter; } }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace controller {
+namespace sd::slidesorter::controller {
 
 /** Manage requests for scrolling page objects into view.
 */
@@ -84,7 +84,7 @@ private:
     ::std::optional<Point> GetRequestedTopLeft() const;
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index 4773c2c2d10d..a2a87b8c9bdc 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -34,14 +34,12 @@ class SdDrawDocument;
 class SdrPage;
 class SdPage;
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace com { namespace sun { namespace star { namespace container { class XIndexAccess; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::drawing { class XDrawPage; }
 
-namespace sd { namespace slidesorter { namespace model {
+namespace sd::slidesorter::model {
 
 inline sal_Int32 FromCoreIndex (const sal_uInt16 nCoreIndex) { return (nCoreIndex-1)/2; }
 
@@ -223,7 +221,7 @@ private:
     void UpdateIndices (const sal_Int32 nFirstIndex);
 };
 
-} } } // end of namespace ::sd::slidesorter::model
+} // end of namespace ::sd::slidesorter::model
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx
index 5e6f681f23a1..cc67149eb174 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx
@@ -22,7 +22,7 @@
 
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace model {
+namespace sd::slidesorter::model {
 
 /** Interface to generic enumerations.  Designed to operate on shared
     pointers.  Therefore GetNextElement() returns T and not T&.
@@ -41,7 +41,7 @@ public:
     virtual ::std::unique_ptr<Enumeration<T> > Clone() = 0;
 };
 
-} } } // end of namespace ::sd::slidesorter::model
+} // end of namespace ::sd::slidesorter::model
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index 247588b6b2e2..5b5f00b79559 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -26,12 +26,12 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com::sun::star::drawing { class XDrawPage; }
 
 class SdPage;
 class SdrPage;
 
-namespace sd { namespace slidesorter { namespace model {
+namespace sd::slidesorter::model {
 
 /** Each PageDescriptor object represents the preview of one draw page,
     slide, or master page of a Draw or Impress document as they are displayed
@@ -140,7 +140,7 @@ private:
     PageDescriptor& operator= (const PageDescriptor& rDescriptor) = delete;
 };
 
-} } } // end of namespace ::sd::slidesorter::model
+} // end of namespace ::sd::slidesorter::model
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
index 5816fd41bcd9..a1992fd24d16 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
@@ -26,7 +26,7 @@
 #include <functional>
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace model {
+namespace sd::slidesorter::model {
 
 class SlideSorterModel;
 
@@ -95,7 +95,7 @@ private:
 
 };
 
-} } } // end of namespace ::sd::slidesorter::model
+} // end of namespace ::sd::slidesorter::model
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx
index b62f3dedcf8d..1118e45885ce 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx
@@ -22,7 +22,7 @@
 
 #include <model/SlsPageEnumeration.hxx>
 
-namespace sd { namespace slidesorter { namespace model {
+namespace sd::slidesorter::model {
 
 class SlideSorterModel;
 
@@ -47,7 +47,7 @@ public:
     static PageEnumeration CreateVisiblePagesEnumeration (const SlideSorterModel& rModel);
 };
 
-} } } // end of namespace ::sd::slidesorter::model
+} // end of namespace ::sd::slidesorter::model
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx
index cee3acc1ae0c..3f2b2a65da69 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx
@@ -22,13 +22,13 @@
 
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace model {
+namespace sd::slidesorter::model {
 
 class PageDescriptor;
 
 typedef std::shared_ptr<PageDescriptor> SharedPageDescriptor;
 
-} } } // end of namespace ::sd::slidesorter::model
+} // end of namespace ::sd::slidesorter::model
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
index 392c2e4c6667..d205a5154c63 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
@@ -23,7 +23,7 @@
 #include <sal/types.h>
 #include <tools/gen.hxx>
 
-namespace sd { namespace slidesorter { namespace model {
+namespace sd::slidesorter::model {
 
 /** This class gives access to values related to the visualization of page
     objects.  This includes animation state when blending from one state to
@@ -44,7 +44,7 @@ private:
     Point maLocationOffset;
 };
 
-} } } // end of namespace ::sd::slidesorter::model
+} // end of namespace ::sd::slidesorter::model
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 0794502f1099..5d1e27d0b294 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -31,18 +31,11 @@
 #include <vcl/region.hxx>
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace cache {
-class PageCache;
-} } }
-
-namespace sd { namespace slidesorter { namespace model {
-class SlideSorterModel;
-} } }
-
+namespace sd::slidesorter::cache { class PageCache; }
+namespace sd::slidesorter::model { class SlideSorterModel; }
 namespace sd { class Window; }
-namespace sd { namespace slidesorter { class SlideSorter; } }
-
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter { class SlideSorter; }
+namespace sd::slidesorter::view {
 
 class LayeredDevice;
 class PageObjectPainter;
@@ -228,7 +221,7 @@ private:
     void Rearrange();
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
index a8c39b9bc650..b53ec3b54d79 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
@@ -25,7 +25,7 @@
 class OutputDevice;
 namespace tools { class Rectangle; }
 
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 class ILayerInvalidator
 {
@@ -49,7 +49,7 @@ public:
 };
 typedef std::shared_ptr<ILayerPainter> SharedILayerPainter;
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
index b19905c5b4ef..15a93168406e 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
@@ -23,7 +23,7 @@
 #include <controller/SlsAnimator.hxx>
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 class InsertPosition;
 
@@ -55,7 +55,7 @@ private:
     std::shared_ptr<Implementation> mpImplementation;
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index 18ad49116d94..7a690c0e7027 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -31,11 +31,9 @@
 class OutputDevice;
 class SdTransferable;
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 class FramePainter;
 
@@ -99,7 +97,7 @@ private:
         const sal_Int32 nSelectionCount);
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index a57b3a7ece38..41ab314662fc 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -26,11 +26,11 @@
 #include <memory>
 
 namespace sd { class Window; }
-namespace sd { namespace slidesorter { namespace model { class SlideSorterModel; } } }
-namespace sd { namespace slidesorter { namespace view { class PageObjectLayouter; } } }
-namespace sd { namespace slidesorter { namespace view { class Theme; } } }
+namespace sd::slidesorter::model { class SlideSorterModel; }
+namespace sd::slidesorter::view { class PageObjectLayouter; }
+namespace sd::slidesorter::view { class Theme; }
 
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 class InsertPosition;
 
@@ -233,7 +233,7 @@ private:
     Point maTrailingOffset;
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 9b8629fa642f..9c4cf99f81bd 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -27,7 +27,7 @@
 namespace vcl { class Font; }
 namespace sd { class Window; }
 
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 /** In contrast to the Layouter that places page objects in the view, the
     PageObjectLayouter places the parts of individual page objects like page
@@ -140,7 +140,7 @@ private:
         const sal_Int32 nFocusIndicatorWidth);
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 4cd1deaeec5c..786f8dbd8fa4 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -24,13 +24,10 @@
 #include <view/SlsTheme.hxx>
 #include <memory>
 
-namespace sd { namespace slidesorter { namespace cache {
-class PageCache;
-} } }
+namespace sd::slidesorter::cache { class PageCache; }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { class SlideSorter; } }
-
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 class Layouter;
 class PageObjectLayouter;
@@ -118,7 +115,7 @@ private:
     bool UpdatePageObjectLayouter();
 };
 
-} } } // end of namespace sd::slidesorter::view
+} // end of namespace sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index e94c97b1c44b..81b5fe36da1b 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -27,11 +27,9 @@
 
 namespace vcl { class Font; }
 
-namespace sd { namespace slidesorter { namespace controller {
-class Properties;
-} } }
+namespace sd::slidesorter::controller { class Properties; }
 
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 const int Theme_FocusIndicatorWidth = 3;
 
@@ -133,7 +131,7 @@ private:
     void InitializeIcon(const IconType eType, const OUString& rResourceId);
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
index 16528627179d..ef699af7e51b 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
@@ -24,9 +24,9 @@
 #include <rtl/ustring.hxx>
 #include <vcl/timer.hxx>
 
-namespace sd { namespace slidesorter { class SlideSorter; } }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 /** Manage the display of tool tips.  The tool tip text changes when the
     mouse is moved from slide to slide or from button to button.
@@ -68,7 +68,7 @@ private:
     DECL_LINK(DelayTrigger, Timer*, void);
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index 2a39548b05e7..d507c1c81abc 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -27,9 +27,9 @@
 #include <cppuhelper/compbase.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
+namespace com::sun::star::awt { class XWindow; }
 
-namespace sd { namespace slidesorter {
+namespace sd::slidesorter {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::XSlideSorterBase,
@@ -151,7 +151,7 @@ private:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sd::slidesorter
+} // end of namespace ::sd::slidesorter
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx
index 1fbb22db620d..f8048ad0d06d 100644
--- a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx
+++ b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx
@@ -22,7 +22,7 @@
 
 #include <vcl/bitmapex.hxx>
 
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 class FramePainter
 {
@@ -105,7 +105,7 @@ private:
     bool mbIsValid;
 };
 
-} } } // end of namespace sd::slidesorter::view
+} // end of namespace sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
index df545f2f8e73..918d230f26af 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
@@ -33,7 +33,7 @@ namespace vcl { class Region; }
 
 class VirtualDevice;
 
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 /** A simple wrapper around an OutputDevice that provides support for
     independent layers and buffering.
@@ -80,7 +80,7 @@ private:
     void RepaintRectangle (const ::tools::Rectangle& rRepaintRectangle);
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx
index 27323dc77eaf..f668d62e6a82 100644
--- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx
+++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx
@@ -23,15 +23,10 @@
 #include <cache/SlsCacheContext.hxx>
 #include <model/SlsSharedPageDescriptor.hxx>
 
-namespace sd { namespace slidesorter { namespace model {
-class SlideSorterModel;
-} } }
+namespace sd::slidesorter::model { class SlideSorterModel; }
+namespace sd::slidesorter { class SlideSorter; }
 
-namespace sd { namespace slidesorter {
-class SlideSorter;
-} }
-
-namespace sd { namespace slidesorter { namespace view {
+namespace sd::slidesorter::view {
 
 /** The cache context for the SlideSorter as used by Draw and Impress.  See
     the base class for documentation of the individual methods.
@@ -56,7 +51,7 @@ private:
     model::SharedPageDescriptor GetDescriptor (cache::CacheKey aKey);
 };
 
-} } } // end of namespace ::sd::slidesorter::view
+} // end of namespace ::sd::slidesorter::view
 
 #endif
 
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 3575366cac63..27f2b164d755 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -24,9 +24,9 @@
 #include <sfx2/sidebar/PanelLayout.hxx>
 #include <vcl/weld.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XIndexAccess; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawView; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::drawing { class XDrawView; }
 
 namespace sd
 {
diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx
index 69a4729d9818..7fc7212f6ac9 100644
--- a/sd/source/ui/table/tableobjectbar.hxx
+++ b/sd/source/ui/table/tableobjectbar.hxx
@@ -30,7 +30,7 @@ class ViewShell;
 
 }
 
-namespace sd { namespace ui { namespace table {
+namespace sd::ui::table {
 
 class TableObjectBar final : public SfxShell
 {
@@ -52,7 +52,7 @@ private:
     ::sd::ViewShell* mpViewSh;
 };
 
-} } }
+}
 
 #endif
 
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.hxx b/sd/source/ui/unoidl/UnoDocumentSettings.hxx
index 58eeaa436998..5e6c813eb0cf 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.hxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { class XInterface; }
 
 class SdXImpressDocument;
 
diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx
index 9f34739ea22e..e68d54c802c5 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -42,7 +42,7 @@ namespace com
     }
 }
 
-namespace com { namespace sun { namespace star { namespace frame { struct DispatchDescriptor; } } } }
+namespace com::sun::star::frame { struct DispatchDescriptor; }
 
 class SdUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
 {
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index b258f4fd2ac7..1e42d2d7d8a4 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <svx/unomaster.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
+namespace com::sun::star::beans { class XPropertySetInfo; }
 
 class SdXImpressDocument;
 class SdAnimationInfo;
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index ce7e22c52f84..c4b4c208a8bb 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1406,7 +1406,8 @@ void CurrentPageSetter::operator() (bool)
 
 //===== FocusForwardingWindow =================================================
 
-namespace sd { namespace {
+namespace sd {
+namespace {
 
 FocusForwardingWindow::FocusForwardingWindow (
     vcl::Window& rParentWindow,
author	Noel Grandin <noel.grandin@collabora.co.uk>	2020-05-09 15:54:06 +0200
committer	Noel Grandin <noel.grandin@collabora.co.uk>	2020-05-09 20:02:29 +0200
commit	00d170213a112922980db67df62b8ee324ff2631 (patch)
tree	a277feaf79a3014a777f25e87730a013da919c2d /sd/source
parent	32ff26f771a90050f524968dfd5381818274f673 (diff)