use more compact namespace syntax in /include

excluding the UDK headers of course Change-Id: Iac7ab83d60265f7d362c860776f1de9d5e444ec0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93268 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
author: Noel Grandin <noel.grandin@collabora.co.uk> 2020-05-01 14:52:05 +0200
committer: Noel Grandin <noel.grandin@collabora.co.uk> 2020-05-03 09:21:51 +0200
commit: 47cd34a60ff9048404075823e519f1abdd4b0e9a (patch)
tree: e9728dd7c686d23f90b4331f105d6f5f8c1176cd
parent: c79dd92480cbc409a7061da7f3dd3abaaf9a4883 (diff)
486 files changed, 1268 insertions, 1354 deletions
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index d52cbc5decad..3bf21ada8c59 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -28,7 +28,7 @@
 #include <basegfx/basegfxdllapi.h>
 
 
-namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonBezierCoords; } } } }
+namespace com::sun::star::drawing { struct PolyPolygonBezierCoords; }
 
 namespace basegfx
 {
diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx
index fbaf07e70581..3111c9df50a0 100644
--- a/include/basegfx/polygon/b3dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolypolygontools.hxx
@@ -25,7 +25,7 @@
 #include <basegfx/basegfxdllapi.h>
 
 
-namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } }
+namespace com::sun::star::drawing { struct PolyPolygonShape3D; }
 
 namespace basegfx
 {
diff --git a/include/basegfx/utils/canvastools.hxx b/include/basegfx/utils/canvastools.hxx
index fa2ad145c154..794074da0fdb 100644
--- a/include/basegfx/utils/canvastools.hxx
+++ b/include/basegfx/utils/canvastools.hxx
@@ -25,7 +25,7 @@
 #include <basegfx/basegfxdllapi.h>
 
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
 {
     struct AffineMatrix2D;
     struct AffineMatrix3D;
@@ -36,18 +36,18 @@ namespace com { namespace sun { namespace star { namespace geometry
     struct IntegerSize2D;
     struct IntegerRectangle2D;
     struct RealBezierSegment2D;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     class  XGraphicDevice;
     class  XPolyPolygon2D;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace awt
+namespace com::sun::star::awt
 {
     struct Rectangle;
-} } } }
+}
 
 namespace basegfx
 {
diff --git a/include/basegfx/utils/keystoplerp.hxx b/include/basegfx/utils/keystoplerp.hxx
index 551e31bcf65a..b35c46e638f1 100644
--- a/include/basegfx/utils/keystoplerp.hxx
+++ b/include/basegfx/utils/keystoplerp.hxx
@@ -23,9 +23,9 @@
 #include <vector>
 #include <basegfx/basegfxdllapi.h>
 
-namespace com{ namespace sun{ namespace star{ namespace uno {
+namespace com::sun::star::uno {
     template<typename T> class Sequence;
-}}}}
+}
 
 namespace basegfx
 {
diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx
index 10f734cfebe3..56e230f4d5a6 100644
--- a/include/canvas/canvastools.hxx
+++ b/include/canvas/canvastools.hxx
@@ -43,15 +43,15 @@ namespace basegfx
     class B2DPolyPolygon;
 }
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
 {
     struct RealSize2D;
     struct IntegerSize2D;
     struct AffineMatrix2D;
     struct Matrix2D;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     struct RenderState;
     struct ViewState;
@@ -59,17 +59,17 @@ namespace com { namespace sun { namespace star { namespace rendering
     class  XCanvas;
     struct Texture;
     class  XIntegerBitmapColorSpace;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace awt
+namespace com::sun::star::awt
 {
     struct Rectangle;
     class  XWindow2;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct PropertyValue;
-} } } }
+}
 
 class Color;
 class OutputDevice;
diff --git a/include/codemaker/commoncpp.hxx b/include/codemaker/commoncpp.hxx
index 29e2c9dfc2e1..b7586e872426 100644
--- a/include/codemaker/commoncpp.hxx
+++ b/include/codemaker/commoncpp.hxx
@@ -29,7 +29,7 @@ namespace rtl {
     class OUString;
 }
 
-namespace codemaker { namespace cpp {
+namespace codemaker::cpp {
 
 /** Stick a namespace scope to c++ type
 
@@ -55,7 +55,7 @@ rtl::OString translateUnoToCppIdentifier(
     IdentifierTranslationMode transmode = IdentifierTranslationMode::Global,
     rtl::OString const * forbidden = nullptr);
 
-} }
+}
 
 #endif // INCLUDED_CODEMAKER_COMMONCPP_HXX
 
diff --git a/include/codemaker/commonjava.hxx b/include/codemaker/commonjava.hxx
index d34540f19734..11e1446bf64a 100644
--- a/include/codemaker/commonjava.hxx
+++ b/include/codemaker/commonjava.hxx
@@ -26,7 +26,7 @@
 
 namespace rtl { class OString; }
 
-namespace codemaker { namespace java {
+namespace codemaker::java {
 
 rtl::OString translateUnoToJavaType(
     codemaker::UnoType::Sort sort, rtl::OString const & nucleus,
@@ -35,7 +35,7 @@ rtl::OString translateUnoToJavaType(
 rtl::OString translateUnoToJavaIdentifier(
     rtl::OString const & identifier, rtl::OString const & prefix);
 
-} }
+}
 
 #endif // INCLUDED_CODEMAKER_COMMONJAVA_HXX
 
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 8ac2cecf407a..46b892c37525 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
+namespace com::sun::star::view { class XSelectionSupplier; }
 
 //= selection helper classes
 
diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx
index 90df00caabb4..75828cda6319 100644
--- a/include/comphelper/accessibleeventnotifier.hxx
+++ b/include/comphelper/accessibleeventnotifier.hxx
@@ -22,10 +22,10 @@
 
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleEventListener; } } } }
-namespace com { namespace sun { namespace star { namespace accessibility { struct AccessibleEventObject; } } } }
+namespace com::sun::star::uno { class XInterface; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::accessibility { class XAccessibleEventListener; }
+namespace com::sun::star::accessibility { struct AccessibleEventObject; }
 
 namespace comphelper {
 
diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index 04de7c7d87e9..576cc89cf4ee 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -26,9 +26,9 @@
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class XCharacterClassification; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct Boundary; } } } }
+namespace com::sun::star::i18n { class XBreakIterator; }
+namespace com::sun::star::i18n { class XCharacterClassification; }
+namespace com::sun::star::i18n { struct Boundary; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index 2772084476bc..dd7da31a0c46 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -40,7 +40,7 @@
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ref.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/anytostring.hxx b/include/comphelper/anytostring.hxx
index e5a0e4ab2eb0..21afda1a6cd1 100644
--- a/include/comphelper/anytostring.hxx
+++ b/include/comphelper/anytostring.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com::sun::star::uno { class Any; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/base64.hxx b/include/comphelper/base64.hxx
index 763312caaa78..d962aabacda0 100644
--- a/include/comphelper/base64.hxx
+++ b/include/comphelper/base64.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 namespace comphelper {
 
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index cd54f37a569b..96e185d78838 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/io/XObjectInputStream.hpp>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace awt { struct FontDescriptor; } } } }
+namespace com::sun::star::awt { struct FontDescriptor; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index de65a7ad3f1e..e56951281f9e 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -20,7 +20,7 @@
 #include <sal/types.h>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace configuration { class XReadWriteAccess; }
     namespace container {
         class XHierarchicalNameAccess;
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star {
         class XNameContainer;
     }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace comphelper {
 
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index e09a3a985882..162319316df6 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -26,8 +26,8 @@
 #include <comphelper/comphelperdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { class XInterface; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/configurationlistener.hxx b/include/comphelper/configurationlistener.hxx
index 4897323b8b9e..29a2b578b588 100644
--- a/include/comphelper/configurationlistener.hxx
+++ b/include/comphelper/configurationlistener.hxx
@@ -19,8 +19,8 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configurationhelper.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyChangeEvent; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::beans { struct PropertyChangeEvent; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace comphelper {
 
diff --git a/include/comphelper/dispatchcommand.hxx b/include/comphelper/dispatchcommand.hxx
index f0b67eda70eb..384536952789 100644
--- a/include/comphelper/dispatchcommand.hxx
+++ b/include/comphelper/dispatchcommand.hxx
@@ -14,9 +14,9 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XDispatchResultListener; class XFrame; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::frame { class XDispatchResultListener; class XFrame; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index b45d584c9c7a..7505e3bdf2c4 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -25,9 +25,9 @@
 #include <comphelper/docpasswordrequest.hxx>
 #include <comphelper/hash.hxx>
 
-namespace com { namespace sun { namespace star { namespace task { class XInteractionHandler; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::beans { struct NamedValue; }
 
 namespace comphelper {
 
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index 4f1d034e2eb6..a4e8704eb5e4 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -26,7 +26,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
-namespace com { namespace sun { namespace star { namespace task { class XInteractionAbort; } } } }
+namespace com::sun::star::task { class XInteractionAbort; }
 
 namespace comphelper {
 
diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx
index a195722b9169..a7002120a4bf 100644
--- a/include/comphelper/documentinfo.hxx
+++ b/include/comphelper/documentinfo.hxx
@@ -23,8 +23,8 @@
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
 
 namespace comphelper {
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index 93f7327b5435..130a6a1ad031 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -26,12 +26,12 @@
 #include <rtl/ustring.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } }
-namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace task { class XInteractionHandler; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::embed { class XEmbeddedObject; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::uno { class XInterface; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/eventattachermgr.hxx b/include/comphelper/eventattachermgr.hxx
index 22323514aace..4a2a99909459 100644
--- a/include/comphelper/eventattachermgr.hxx
+++ b/include/comphelper/eventattachermgr.hxx
@@ -23,14 +23,14 @@
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 namespace uno {
     class XComponentContext;
 }
 namespace script {
     class XEventAttacherManager;
 }
-} } }
+}
 
 
 namespace comphelper
diff --git a/include/comphelper/genericpropertyset.hxx b/include/comphelper/genericpropertyset.hxx
index 527b7d8e4960..8f61ac14befb 100644
--- a/include/comphelper/genericpropertyset.hxx
+++ b/include/comphelper/genericpropertyset.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
 namespace comphelper { class PropertySetInfo; }
 
 namespace comphelper
diff --git a/include/comphelper/getexpandeduri.hxx b/include/comphelper/getexpandeduri.hxx
index ab73a5ff8596..90eb101b7b2c 100644
--- a/include/comphelper/getexpandeduri.hxx
+++ b/include/comphelper/getexpandeduri.hxx
@@ -15,11 +15,8 @@
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 namespace comphelper {
 
diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx
index 63888008d3ea..c049a6c6726e 100644
--- a/include/comphelper/interfacecontainer2.hxx
+++ b/include/comphelper/interfacecontainer2.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { class XInterface; }
 namespace osl { class Mutex; }
 
 /** */ //for docpp
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index ba52983f86af..688571304938 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -27,7 +27,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } }
+namespace com::sun::star::lang { class XEventListener; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index d7bd806c8f84..f0a599765b80 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -38,7 +38,7 @@ namespace comphelper
     //= EventLogger
 
 
-    namespace log { namespace convert
+    namespace log::convert
     {
         inline const OUString& convertLogArgToString( const OUString& _rValue )
         {
@@ -59,7 +59,7 @@ namespace comphelper
         inline OUString convertLogArgToString( bool    _bValue ) { return OUString::boolean( _bValue ); }
         void convertLogArgToString(sal_Bool) = delete;
 
-    } } // namespace log::convert
+    } // namespace log::convert
 
 
     //= EventLogger
diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx
index c9b38452ad81..f7472dfd2918 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -23,13 +23,13 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XContainerQuery; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace embed { struct VerbDescriptor; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::container { class XContainerQuery; }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::embed { struct VerbDescriptor; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 enum class SfxFilterFlags;
 
diff --git a/include/comphelper/namecontainer.hxx b/include/comphelper/namecontainer.hxx
index 3df8e1fc3e0b..86553e52ff6c 100644
--- a/include/comphelper/namecontainer.hxx
+++ b/include/comphelper/namecontainer.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
+namespace com::sun::star::container { class XNameContainer; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index f2a9d0b3277a..efb70288f3ba 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -32,7 +32,7 @@
 #include <unordered_map>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { class XInterface; }
 
 namespace comphelper{
 
diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx
index 919be8aac187..e486bac0bb3e 100644
--- a/include/comphelper/numbers.hxx
+++ b/include/comphelper/numbers.hxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } }
+namespace com::sun::star::util { class XNumberFormats; }
+namespace com::sun::star::util { class XNumberFormatter; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx
index 4679d3fd381c..d4efbf39b4f4 100644
--- a/include/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
@@ -24,11 +24,11 @@
 
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace beans { struct StringPair; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::beans { struct StringPair; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/processfactory.hxx b/include/comphelper/processfactory.hxx
index 33b72f51cbed..0f74e5b1365d 100644
--- a/include/comphelper/processfactory.hxx
+++ b/include/comphelper/processfactory.hxx
@@ -23,11 +23,10 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     class XMultiServiceFactory;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+}
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 1a7f86591fe4..b9787f1308bc 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -26,7 +26,7 @@
 #include <type_traits>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index 63c464f49e9d..2c64b2cdfedf 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -25,8 +25,8 @@
 #include <comphelper/comphelperdllapi.h>
 
 
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { class Type; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index 4407e39528ad..38a1ee73056a 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -26,9 +26,7 @@
 #include <rtl/ref.hxx>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace beans {
-    class XPropertySet;
-} } } }
+namespace com::sun::star::beans { class XPropertySet; }
 
 //= property helper classes
 
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 2bd2b47708e8..48444355ce23 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -27,11 +27,11 @@
 #include <cppuhelper/compbase_ex.hxx>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
-namespace com { namespace sun { namespace star { namespace uno { class XAggregation; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } }
+}
+namespace com::sun::star::uno { class XAggregation; }
+namespace com::sun::star::lang { class XComponent; }
 
 /* class hierarchy herein:
 
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index 8e0d07c524aa..d6bcd77f0d1a 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -25,8 +25,8 @@
 
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
+namespace com::sun::star::beans { struct PropertyValue; }
 
 namespace comphelper{
 
diff --git a/include/comphelper/simplefileaccessinteraction.hxx b/include/comphelper/simplefileaccessinteraction.hxx
index 503b70e99c3d..e9295d4d7e83 100644
--- a/include/comphelper/simplefileaccessinteraction.hxx
+++ b/include/comphelper/simplefileaccessinteraction.hxx
@@ -14,8 +14,8 @@
 #include <ucbhelper/interceptedinteraction.hxx>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace task { class XInteractionHandler; } } } }
-namespace com { namespace sun { namespace star { namespace task { class XInteractionRequest; } } } }
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::task { class XInteractionRequest; }
 
 namespace comphelper {
 /** An interaction handler wrapper for simple file access.
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index e84f9d405dae..3b5a991eb4e3 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx
index 2ebec23e1eb7..a4bd3605c296 100644
--- a/include/comphelper/storagehelper.hxx
+++ b/include/comphelper/storagehelper.hxx
@@ -34,7 +34,7 @@
 #define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 "PackageSHA1MS1252EncryptionKey"
 #define PACKAGE_ENCRYPTIONDATA_SHA1CORRECT "PackageSHA1CorrectEncryptionKey"
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct NamedValue; }
     namespace embed { class XStorage; }
     namespace io {
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star {
     }
     namespace lang { class XSingleServiceFactory; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace comphelper {
 
diff --git a/include/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx
index 5de717824705..c4f945966ab5 100644
--- a/include/comphelper/streamsection.hxx
+++ b/include/comphelper/streamsection.hxx
@@ -24,9 +24,9 @@
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace io { class XDataInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XDataOutputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XMarkableStream; } } } }
+namespace com::sun::star::io { class XDataInputStream; }
+namespace com::sun::star::io { class XDataOutputStream; }
+namespace com::sun::star::io { class XMarkableStream; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx
index 3f7ebf958512..1db92036949b 100644
--- a/include/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
@@ -32,13 +32,13 @@
 
 #include <com/sun/star/lang/Locale.hpp>
 
-namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class XCollator; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::i18n { class XBreakIterator; }
+namespace com::sun::star::i18n { class XCollator; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 // OUString helper functions that are not widespread or mature enough to
 // go into the stable URE API:
-namespace comphelper { namespace string {
+namespace comphelper::string {
 
 /** Compare an OUString to a single char
 
@@ -375,7 +375,7 @@ COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OString &rString);
  */
 COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OUString &rString);
 
-} }
+}
 
 #endif
 
diff --git a/include/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx
index 3c2b89b9fbfd..8503b2a431e5 100644
--- a/include/comphelper/synchronousdispatch.hxx
+++ b/include/comphelper/synchronousdispatch.hxx
@@ -25,15 +25,15 @@
 #include <com/sun/star/uno/Reference.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class XInterface; }
     namespace lang {
         class XComponent; }
-} } }
+}
 
-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; }
 
 
 namespace comphelper
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index b35fbef5f18f..2cb47f2218bc 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -25,12 +25,12 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/comphelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     struct FontDescriptor;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { class XInterface; }
 
 
 namespace comphelper
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index 611744e4796c..dc26966115fc 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
-namespace com { namespace sun { namespace star { namespace uno { class XWeak; } } } }
+namespace com::sun::star::uno { class XWeak; }
 
 namespace comphelper
 {
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index fdf763dc7a4f..27d965d4b2bb 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -26,7 +26,7 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/FValue.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 
 namespace sdb {
     class XSingleSelectQueryComposer;
@@ -66,7 +66,7 @@ namespace task {
     class XInteractionHandler;
 }
 
-} } }
+}
 
 class SvStream;
 
diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx
index 0dd3f69f3a84..1b163b82d479 100644
--- a/include/cppcanvas/bitmap.hxx
+++ b/include/cppcanvas/bitmap.hxx
@@ -25,10 +25,10 @@
 #include <cppcanvas/bitmapcanvas.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     class  XBitmap;
-} } } }
+}
 
 
 /* Definition of Bitmap interface */
diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx
index ec34af5e0caa..97562ede24fb 100644
--- a/include/cppcanvas/canvas.hxx
+++ b/include/cppcanvas/canvas.hxx
@@ -29,11 +29,11 @@ namespace basegfx
     class B2DPolyPolygon;
 }
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     class  XCanvas;
     struct ViewState;
-} } } }
+}
 
 
 /* Definition of BitmapCanvas */
diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx
index 058ea25940d4..917ef4dafb04 100644
--- a/include/cppcanvas/polypolygon.hxx
+++ b/include/cppcanvas/polypolygon.hxx
@@ -25,10 +25,10 @@
 #include <cppcanvas/color.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     class  XPolyPolygon2D;
-} } } }
+}
 
 
 /* Definition of tools::PolyPolygon interface */
diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx
index abeef3d2b25f..c4d100dbedb9 100644
--- a/include/cppcanvas/spritecanvas.hxx
+++ b/include/cppcanvas/spritecanvas.hxx
@@ -25,10 +25,10 @@
 #include <cppcanvas/customsprite.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     class  XSpriteCanvas;
-} } } }
+}
 
 
 /* Definition of SpriteCanvas */
diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx
index b36b66a7ad34..73867626d3c0 100644
--- a/include/cppcanvas/vclfactory.hxx
+++ b/include/cppcanvas/vclfactory.hxx
@@ -33,12 +33,12 @@ class BitmapEx;
 
 class GDIMetaFile;
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     class  XCanvas;
     class  XBitmapCanvas;
     class  XSpriteCanvas;
-} } } }
+}
 
 /* Definition of VCLFactory class */
 
diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx
index 754667afd4c0..82e8c5603b16 100644
--- a/include/dbaccess/IController.hxx
+++ b/include/dbaccess/IController.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         struct PropertyValue;
     }
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
     namespace frame {
         class XController;
     }
-} } }
+}
 
 class NotifyEvent;
 
diff --git a/include/dbaccess/controllerframe.hxx b/include/dbaccess/controllerframe.hxx
index fd14bb02f92a..97a9c249d43a 100644
--- a/include/dbaccess/controllerframe.hxx
+++ b/include/dbaccess/controllerframe.hxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/frame/FrameAction.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame { class XFrame; }
-} } }
+}
 
 namespace dbaui
 {
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index 738ccc352da1..b599b8c513c5 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -29,10 +29,10 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/window.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame { class XFrame; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace svt {
     class AcceleratorExecute;
diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx
index b39e36f49783..f6f75c063cc5 100644
--- a/include/dbaccess/dbaundomanager.hxx
+++ b/include/dbaccess/dbaundomanager.hxx
@@ -30,11 +30,11 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document { class XUndoAction; }
     namespace document { class XUndoManagerListener; }
     namespace uno { class XInterface; }
-} } }
+}
 
 namespace cppu {
     class OWeakObject;
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx
index 01da13c9f8ff..a1bc687ce512 100644
--- a/include/dbaccess/dbsubcomponentcontroller.hxx
+++ b/include/dbaccess/dbsubcomponentcontroller.hxx
@@ -35,7 +35,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XPropertySet; }
     namespace beans { struct PropertyValue; }
     namespace document { class XEmbeddedScripts; }
@@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star {
     namespace uno { class XComponentContext; }
     namespace util { class XModifyListener; }
     namespace util { class XNumberFormatter; }
-} } }
+}
 
 namespace dbtools {
     class DatabaseMetaData;
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index 805131548f28..c60cf9feb25c 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -62,7 +62,7 @@
 #include <tools/link.hxx>
 #include <vcl/vclptr.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { class XKeyHandler; }
     namespace awt { class XMouseClickHandler; }
     namespace awt { class XWindow; }
@@ -83,7 +83,7 @@ namespace com { namespace sun { namespace star {
     namespace ui { class XSidebarProvider; }
     namespace uno { class XComponentContext; }
     namespace util { class XURLTransformer; }
-} } }
+}
 
 namespace vcl { class Window; }
 namespace weld { class Window; }
diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx
index 6bea915a8e67..a994c826f48b 100644
--- a/include/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
     class BColor;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpFillGradientAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx
index 971241f5469a..2cec83c68962 100644
--- a/include/drawinglayer/attribute/fillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx
@@ -31,9 +31,9 @@ namespace basegfx {
     class B2DRange;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpFillGraphicAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx
index a4ffe4b656a7..7c2f819f0ac1 100644
--- a/include/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/include/drawinglayer/attribute/fillhatchattribute.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
     class BColor;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpFillHatchAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx
index 5308ababbd24..a12ffb405001 100644
--- a/include/drawinglayer/attribute/fontattribute.hxx
+++ b/include/drawinglayer/attribute/fontattribute.hxx
@@ -30,9 +30,9 @@ namespace rtl {
    class OUString;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpFontAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/linestartendattribute.hxx b/include/drawinglayer/attribute/linestartendattribute.hxx
index 1de23c832bd7..9f87e6cb7ecf 100644
--- a/include/drawinglayer/attribute/linestartendattribute.hxx
+++ b/include/drawinglayer/attribute/linestartendattribute.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
     class B2DPolyPolygon;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpLineStartEndAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx
index c343f7a19a26..4eddfea25109 100644
--- a/include/drawinglayer/attribute/materialattribute3d.hxx
+++ b/include/drawinglayer/attribute/materialattribute3d.hxx
@@ -26,9 +26,9 @@
 
 // predefines
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpMaterialAttribute3D;
-}}
+}
 
 namespace basegfx {
     class BColor;
diff --git a/include/drawinglayer/attribute/sdrfillattribute.hxx b/include/drawinglayer/attribute/sdrfillattribute.hxx
index 54567bb1885c..7801f04123d6 100644
--- a/include/drawinglayer/attribute/sdrfillattribute.hxx
+++ b/include/drawinglayer/attribute/sdrfillattribute.hxx
@@ -30,12 +30,12 @@ namespace basegfx {
     class BColor;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpSdrFillAttribute;
     class FillGradientAttribute;
     class FillHatchAttribute;
     class SdrFillGraphicAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
index caebc4adf544..281733132d31 100644
--- a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
@@ -32,10 +32,10 @@ namespace basegfx {
     class B2DVector;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class FillGraphicAttribute;
     class ImpSdrFillGraphicAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx
index 31ee658b3b37..06d024f5b9d4 100644
--- a/include/drawinglayer/attribute/sdrlightattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx
@@ -31,9 +31,9 @@ namespace basegfx {
     class B3DVector;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpSdr3DLightAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx
index 5fa40db3b524..35a4da1c65a8 100644
--- a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx
@@ -33,10 +33,10 @@ namespace basegfx {
     class B3DVector;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpSdrLightingAttribute;
     class Sdr3DLightAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrlineattribute.hxx b/include/drawinglayer/attribute/sdrlineattribute.hxx
index 59c9985f1b27..f0ea867b6616 100644
--- a/include/drawinglayer/attribute/sdrlineattribute.hxx
+++ b/include/drawinglayer/attribute/sdrlineattribute.hxx
@@ -33,9 +33,9 @@ namespace basegfx {
     class BColor;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpSdrLineAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx
index 8c14bc24ebda..e3a90ac6f372 100644
--- a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx
+++ b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
     class B2DPolyPolygon;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpSdrLineStartEndAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
index f0a325d604ad..2e8013dd6d84 100644
--- a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
@@ -31,10 +31,10 @@
 
 // predefines
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpSdr3DObjectAttribute;
     class MaterialAttribute3D;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx
index 1e18788b8172..2fca2acb4038 100644
--- a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx
@@ -29,9 +29,9 @@
 
 // predefines
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpSdrSceneAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrshadowattribute.hxx b/include/drawinglayer/attribute/sdrshadowattribute.hxx
index c785a24f1e81..fc797dc9d0a0 100644
--- a/include/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/include/drawinglayer/attribute/sdrshadowattribute.hxx
@@ -31,9 +31,9 @@ namespace basegfx {
     class B2DVector;
 }
 
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class ImpSdrShadowAttribute;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx
index e6faece8d01f..77bcec66cd13 100644
--- a/include/drawinglayer/geometry/viewinformation3d.hxx
+++ b/include/drawinglayer/geometry/viewinformation3d.hxx
@@ -28,9 +28,9 @@
 
 // predefines
 
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
     class ImpViewInformation3D;
-}}
+}
 
 namespace basegfx {
     class B3DHomMatrix;
diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
index fcd0454cf0c1..635d6bb9d0dc 100644
--- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
@@ -28,7 +28,7 @@
 // predefines
 
 namespace basegfx { class B2DPolygon; }
-namespace drawinglayer { namespace texture { struct B2DHomMatrixAndBColor; } }
+namespace drawinglayer::texture { struct B2DHomMatrixAndBColor; }
 
 
 // FillGradientPrimitive2D class
diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
index ccc7e503ab6d..d32f3ba69ccd 100644
--- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx
+++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
@@ -24,7 +24,7 @@
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
-namespace drawinglayer { namespace primitive2d { class TextSimplePortionPrimitive2D; } }
+namespace drawinglayer::primitive2d { class TextSimplePortionPrimitive2D; }
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index 30d13b787b37..d39a81f98b8b 100644
--- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -24,9 +24,9 @@
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx>
 
-namespace basegfx { namespace utils {
+namespace basegfx::utils {
     class B2DHomMatrixBufferedOnDemandDecompose;
-}}
+}
 
 namespace drawinglayer
 {
diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index fa418e073f21..3f1f189aa03a 100644
--- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -32,9 +32,9 @@ namespace vcl { class Font; }
 class GDIMetaFile;
 namespace tools { class Rectangle; }
 enum class DrawTextFlags;
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
     class FontAttribute;
-}}
+}
 
 namespace com::sun::star::lang { struct Locale; }
 
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 2d2fd1b68963..8fab8e6f6089 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -44,11 +44,11 @@
 
 // predefines
 
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
     class ViewInformation3D;
-}}
+}
 
-namespace drawinglayer { namespace primitive3d {
+namespace drawinglayer::primitive3d {
     /// typedefs for basePrimitive3DImplBase, Primitive3DContainer and Primitive3DReference
     typedef cppu::WeakComponentImplHelper< css::graphic::XPrimitive3D > BasePrimitive3DImplBase;
     typedef css::uno::Reference< css::graphic::XPrimitive3D > Primitive3DReference;
@@ -72,7 +72,7 @@ namespace drawinglayer { namespace primitive3d {
         bool operator!=(const Primitive3DContainer& rB) const { return !operator==(rB); }
         basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& aViewInformation) const;
     };
-}}
+}
 
 
 // basePrimitive3D class
diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index 8a296b9a334f..621de447986e 100644
--- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
@@ -29,9 +29,9 @@
 
 // predefines
 
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
     class ViewInformation3D;
-}}
+}
 
 
 namespace drawinglayer
diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
index 184149e00412..3b044b451f2f 100644
--- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
@@ -26,7 +26,7 @@
 
 namespace basegfx { class B2DPolygon; }
 namespace basegfx { class B2DPolyPolygon; }
-namespace drawinglayer { namespace primitive2d { class ScenePrimitive2D; }}
+namespace drawinglayer::primitive2d { class ScenePrimitive2D; }
 
 namespace drawinglayer
 {
diff --git a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
index 38612dbaf8a5..59d8fc2b1dc9 100644
--- a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
+++ b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
@@ -22,7 +22,7 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 
-namespace drawinglayer { namespace primitive2d { class ObjectInfoPrimitive2D; }}
+namespace drawinglayer::primitive2d { class ObjectInfoPrimitive2D; }
 
 namespace drawinglayer
 {
diff --git a/include/drawinglayer/processor2d/processor2dtools.hxx b/include/drawinglayer/processor2d/processor2dtools.hxx
index 18ba6b216dc7..95c1c679336c 100644
--- a/include/drawinglayer/processor2d/processor2dtools.hxx
+++ b/include/drawinglayer/processor2d/processor2dtools.hxx
@@ -22,8 +22,8 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <memory>
 
-namespace drawinglayer { namespace geometry { class ViewInformation2D; } }
-namespace drawinglayer { namespace processor2d { class BaseProcessor2D; } }
+namespace drawinglayer::geometry { class ViewInformation2D; }
+namespace drawinglayer::processor2d { class BaseProcessor2D; }
 
 class OutputDevice;
 
diff --git a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
index 25ea79ff477a..f15a98e34784 100644
--- a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
+++ b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
@@ -25,11 +25,11 @@
 
 class OutputDevice;
 
-namespace drawinglayer { namespace processor2d {
+namespace drawinglayer::processor2d {
     class BaseProcessor2D;
-}}
+}
 
-namespace drawinglayer { namespace geometry { class ViewInformation2D; } }
+namespace drawinglayer::geometry { class ViewInformation2D; }
 
 namespace drawinglayer
 {
diff --git a/include/editeng/SpellPortions.hxx b/include/editeng/SpellPortions.hxx
index 89b90d87f09e..0681b5dbbfcc 100644
--- a/include/editeng/SpellPortions.hxx
+++ b/include/editeng/SpellPortions.hxx
@@ -26,9 +26,9 @@
 #include <com/sun/star/linguistic2/SingleProofreadingError.hpp>
 #include <vector>
 
-namespace com{ namespace sun{ namespace star{ namespace linguistic2{
+namespace com::sun::star::linguistic2 {
     class XSpellAlternatives;
-}}}}
+}
 
 namespace com::sun::star::linguistic2 { class XProofreader; }
 
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index d8e780e736e8..292b620a9b95 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -46,7 +46,7 @@
 
 template <typename Arg, typename Ret> class Link;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
   namespace linguistic2 {
     class XSpellChecker1;
     class XHyphenator;
@@ -57,7 +57,7 @@ namespace com { namespace sun { namespace star {
   namespace lang {
     struct Locale;
   }
-}}}
+}
 
 namespace svx {
 struct SpellPortion;
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 7aeff9965a5e..1cadb9978042 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -25,11 +25,11 @@
 #include <vcl/abstdlg.hxx>
 #include <editeng/hangulhanja.hxx>
 
-namespace com { namespace sun { namespace star { namespace linguistic2
+namespace com::sun::star::linguistic2
 {
     class XThesaurus;
     class XHyphenator;
-} } } }
+}
 
 template <typename Arg, typename Ret> class Link;
 
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index c7cd1e02209a..2f44c8e2522b 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -27,11 +27,9 @@
 
 #include <com/sun/star/text/textfield/Type.hpp>
 
-namespace com { namespace sun { namespace star { namespace text {
-
-class XTextContent;
-
-}}}}
+namespace com::sun::star::text {
+    class XTextContent;
+}
 
 class SvNumberFormatter;
 class MetaAction;
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 1b8c4b130463..fda3169cbfd9 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -37,11 +37,7 @@ class SvxBrushItem;
 namespace vcl { class Font; }
 class Graphic;
 class SvxNodeNum;
-namespace com{namespace sun{ namespace star{
-    namespace text{
-        class XNumberingFormatter;
-    }
-}}}
+namespace com::sun::star::text { class XNumberingFormatter; }
 
 namespace com::sun::star::lang { struct Locale; }
 
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 7037e30da288..a048c4e06ac0 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -77,16 +77,16 @@ enum class PointerStyle;
 class SvxNumRule;
 enum class TextRotation;
 
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
     class XSpellChecker1;
     class XHyphenator;
-}}}}
+}
 namespace svx{
     struct SpellPortion;
     typedef std::vector<SpellPortion> SpellPortions;
 }
 namespace basegfx { class B2DPolyPolygon; }
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
 
 
 
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx
index 2f5aac938655..ad0a662d1201 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -27,10 +27,9 @@
 #include <com/sun/star/uno/Reference.h>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
-  namespace datatransfer {
-    class XTransferable;
-} } } }
+namespace com::sun::star {
+  namespace datatransfer { class XTransferable; }
+}
 namespace rtl {
     class OUString;
 };
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 69dfbbc6c780..e9c719d45364 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -28,11 +28,11 @@
 
 // forward ---------------------------------------------------------------
 
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
     class XDictionary;
     class XSpellChecker1;
     class XHyphenator;
-}}}}
+}
 
 // misc functions ---------------------------------------------------------------
 
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index 2deae37c5a13..3032b7b7dc74 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -83,9 +83,9 @@ public:
 };
 
 
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
     class XHyphenatedWord;
-}}}}
+}
 
 
 struct SvxAlternativeSpelling
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 5a1bf293152c..9acfb51bd892 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -44,12 +44,12 @@
 
 class Color;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Rectangle; }
     namespace beans { class XPropertySet; }
     namespace drawing { struct EnhancedCustomShapeParameter; }
     namespace drawing { struct Hatch; }
-} } }
+}
 
 namespace tools {
     class Polygon;
@@ -441,7 +441,7 @@ enum MSOPATHTYPE
 
 const sal_uInt32 DFF_DGG_CLUSTER_SIZE       = 0x00000400;   /// Shape IDs per cluster in DGG atom.
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt {
         struct Gradient;
     }
@@ -450,7 +450,7 @@ namespace com { namespace sun { namespace star {
         class XShape;
         class XShapes;
     }
-}}}
+}
 
 struct MSFILTER_DLLPUBLIC EscherConnectorListEntry
 {
diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index 47067a38fe5e..a7917ec1aa09 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -27,9 +27,9 @@
 #include <sal/types.h>
 #include <vector>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct NamedValue; }
-} } }
+}
 
 namespace msfilter {
 
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 2af6fdfa4682..78ea42bae527 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -66,11 +66,11 @@ class SfxItemSet;
 struct DffObjData;
 class SvGlobalName;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XPropertySet; }
     namespace embed { class XEmbeddedObject; }
     namespace embed { class XStorage; }
-} } }
+}
 
 class MSFILTER_DLLPUBLIC SvxMSDffClientData
 {
diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx
index ae29caae8374..89e64de23af4 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <filter/msfilter/msfilterdllapi.h>
 
-namespace com{namespace sun{namespace star{
+namespace com::sun::star {
         namespace drawing{
                 class XDrawPage;
                 class XShape;
@@ -43,8 +43,7 @@ namespace com{namespace sun{namespace star{
         namespace frame{
                 class XModel;
         }
-
-}}}
+}
 
 class MSFILTER_DLLPUBLIC SvxMSConvertOCXControls
 {
diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx
index c6a3eab9d138..77b2cc3b4608 100644
--- a/include/filter/msfilter/msoleexp.hxx
+++ b/include/filter/msfilter/msoleexp.hxx
@@ -23,9 +23,9 @@
 #include <filter/msfilter/msfilterdllapi.h>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace embed { class XEmbeddedObject; }
-} } }
+}
 
 namespace svt {
     class EmbeddedObjectRef;
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index f3c3e1ac7a47..7ec9ee7c0ab7 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -20,13 +20,13 @@
 #include <tools/stream.hxx>
 #include <vcl/bitmapex.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
     namespace container { class XIndexAccess; }
     namespace graphic { class XGraphic; }
     namespace ui { class XUIConfigurationManager; }
     namespace ui { class XUIConfigurationManagerSupplier; }
-} } }
+}
 
 class TBCHeader;
 
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 5e142df6b503..673476caa9b6 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -31,11 +31,11 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
     namespace uno { class XInterface; }
-} } }
+}
 
 class SfxObjectShell;
 
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 9ee6944f1138..eb54305fa968 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -48,12 +48,12 @@
 #include <vcl/graph.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Size; }
     namespace drawing { class XShape; }
     namespace form { class XFormComponent; }
     namespace frame { class XModel; }
-} } }
+}
 
 class SdrPage;
 class SdrObject;
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index 5b85f749ef75..5ce3b2a2159c 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -20,10 +20,10 @@
 
 class Color;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Size; }
     namespace lang { struct Locale; }
-} } }
+}
 
 namespace msfilter {
 namespace util {
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 185dd7a04ada..ecc9e5dd3f4f 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -42,12 +42,12 @@
 #define FORMULA_MAXPARAMSII      8  /* maximum number of parameters for functions that have implicit intersection ranges */
 
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sheet {
         struct FormulaOpCodeMapEntry;
         struct FormulaToken;
     }
-}}}
+}
 
 class CharClass;
 enum class FormulaError : sal_uInt16;
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx
index 8804e2488d94..bd0595d438d9 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -31,12 +31,12 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sheet { struct FormulaOpCodeMapEntry; }
     namespace sheet { struct FormulaToken; }
     namespace uno { class XComponentContext; }
     namespace uno { class XInterface; }
-} } }
+}
 
 namespace formula
 {
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index 5d4616b9b9e5..82fd50d9736c 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -29,11 +29,11 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sheet { struct FormulaToken; }
     namespace sheet { class XFormulaOpCodeMapper; }
     namespace sheet { class XFormulaParser; }
-} } }
+}
 
 namespace com::sun::star::uno { template <class E> class Sequence; }
 
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 44122686c158..87377cb228e0 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -36,9 +36,9 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sheet { struct FormulaToken; }
-} } }
+}
 
 namespace com::sun::star::uno { template <typename > class Sequence; }
 namespace formula { class FormulaTokenArray; }
diff --git a/include/i18nutil/casefolding.hxx b/include/i18nutil/casefolding.hxx
index 14b0f6bf4333..65dfc2d515d2 100644
--- a/include/i18nutil/casefolding.hxx
+++ b/include/i18nutil/casefolding.hxx
@@ -24,7 +24,7 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <config_options.h>
 
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
 
 enum class TransliterationFlags;
 
diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx
index 99bf5df87116..3590e170a60a 100644
--- a/include/i18nutil/paper.hxx
+++ b/include/i18nutil/paper.hxx
@@ -23,7 +23,7 @@
 #include <i18nutil/i18nutildllapi.h>
 #include <rtl/string.hxx>
 
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
 
 //!! The values of the following enumerators must correspond to the array position
 //!! of the respective paper size in the file i18nutil/source/utility/paper.cxx
diff --git a/include/i18nutil/widthfolding.hxx b/include/i18nutil/widthfolding.hxx
index 73ad5eb2a558..616b6884e5a1 100644
--- a/include/i18nutil/widthfolding.hxx
+++ b/include/i18nutil/widthfolding.hxx
@@ -24,7 +24,7 @@
 #include <i18nutil/i18nutildllapi.h>
 #include <config_options.h>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::uno { template <typename > class Sequence; }
 namespace i18nutil { class oneToOneMapping; }
 
 namespace i18nutil {
diff --git a/include/jvmaccess/classpath.hxx b/include/jvmaccess/classpath.hxx
index c3e3f7fe3603..9882a42ce25e 100644
--- a/include/jvmaccess/classpath.hxx
+++ b/include/jvmaccess/classpath.hxx
@@ -27,11 +27,11 @@
 #include <jvmaccess/jvmaccessdllapi.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 namespace jvmaccess {
 
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 37a2124d2206..52af61c4e61c 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -29,14 +29,8 @@
 #include <rtl/ref.hxx>
 #include <config_options.h>
 
-namespace com { namespace sun { namespace star { namespace beans {
-    class   XPropertySet;
-}}}}
-
-namespace com { namespace sun { namespace star { namespace linguistic2 {
-    struct  LinguServiceEvent;
-}}}}
-
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::linguistic2 { struct LinguServiceEvent; }
 namespace com::sun::star::linguistic2 { class XLinguProperties; }
 
 
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index f0186f3dc33f..a251ced79c63 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -33,14 +33,8 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace beans {
-    class XPropertySet;
-}}}}
-
-namespace com { namespace sun { namespace star { namespace frame {
-    class XDesktop2;
-}}}}
-
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::frame { class XDesktop2; }
 namespace com::sun::star::linguistic2 { class XDictionary; }
 namespace com::sun::star::linguistic2 { class XDictionaryEntry; }
 namespace com::sun::star::linguistic2 { class XHyphenatedWord; }
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 00375842e1ad..2318e52a17cc 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -25,9 +25,9 @@
 #include <oox/dllapi.h>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct NamedValue; }
-} } }
+}
 
 namespace oox { class AttributeList; }
 
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index 51f442f4731f..f9b4ef9a0f5d 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -32,10 +32,10 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XFastAttributeList; } }
-    namespace xml { namespace sax { class XLocator; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XFastAttributeList; }
+    namespace xml::sax { class XLocator; }
+}
 
 namespace oox { class SequenceInputStream; }
 
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index 06761ff0797c..02e2cf2a08f1 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -30,10 +30,10 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XFastAttributeList; } }
-    namespace xml { namespace sax { class XFastContextHandler; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XFastAttributeList; }
+    namespace xml::sax { class XFastContextHandler; }
+}
 
 namespace oox {
     class AttributeList;
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index db8057da0d25..fa79aba5d574 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -26,14 +26,14 @@
 #include <sal/types.h>
 #include <oox/dllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
     namespace uno { class XComponentContext; }
-    namespace xml { namespace sax { class XFastDocumentHandler; } }
-    namespace xml { namespace sax { class XFastParser; } }
-    namespace xml { namespace sax { class XFastTokenHandler; } }
-    namespace xml { namespace sax { struct InputSource; } }
-} } }
+    namespace xml::sax { class XFastDocumentHandler; }
+    namespace xml::sax { class XFastParser; }
+    namespace xml::sax { class XFastTokenHandler; }
+    namespace xml::sax { struct InputSource; }
+}
 
 namespace oox {
     struct NamespaceMap;
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index ed4e35f3b52d..e341de4e0885 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -38,7 +38,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
     namespace drawing { class XShape; }
     namespace frame { class XFrame; }
@@ -50,7 +50,7 @@ namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; }
     namespace task { class XStatusIndicator; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace comphelper {
     class SequenceAsHashMap;
@@ -64,10 +64,10 @@ namespace oox {
     class ModelObjectHelper;
 }
 
-namespace oox { namespace ole {
+namespace oox::ole {
     class OleObjectHelper;
     class VbaProject;
-} }
+}
 
 namespace oox {
 namespace core {
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index 9b34de75b09c..ccb9fe9170b8 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -33,14 +33,14 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
     namespace io { class XInputStream; }
     namespace uno { class XComponentContext; }
-    namespace xml { namespace sax { class XFastAttributeList; } }
-    namespace xml { namespace sax { class XFastContextHandler; } }
-    namespace xml { namespace sax { class XLocator; } }
-} } }
+    namespace xml::sax { class XFastAttributeList; }
+    namespace xml::sax { class XFastContextHandler; }
+    namespace xml::sax { class XLocator; }
+}
 
 namespace utl { class MediaDescriptor; }
 
diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index 2563a7ac9bf8..5983a50c5e7d 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -32,12 +32,12 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
-    namespace xml { namespace sax { class XFastAttributeList; } }
-    namespace xml { namespace sax { class XFastContextHandler; } }
-    namespace xml { namespace sax { class XLocator; } }
-} } }
+    namespace xml::sax { class XFastAttributeList; }
+    namespace xml::sax { class XFastContextHandler; }
+    namespace xml::sax { class XLocator; }
+}
 
 namespace oox {
 namespace core {
diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx
index 7c64c200041d..93822ceafcca 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -31,10 +31,10 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XFastAttributeList; } }
-    namespace xml { namespace sax { class XFastContextHandler; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XFastAttributeList; }
+    namespace xml::sax { class XFastContextHandler; }
+}
 
 namespace oox {
     class AttributeList;
diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx
index 5f284f4a6657..f35d186058f0 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -25,10 +25,10 @@
 #include <oox/core/relations.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XFastAttributeList; } }
-    namespace xml { namespace sax { class XFastContextHandler; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XFastAttributeList; }
+    namespace xml::sax { class XFastContextHandler; }
+}
 
 namespace oox {
 namespace core {
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 68bd801eaefd..4264e54fb3e4 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -31,7 +31,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document { class XDocumentProperties; }
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
@@ -40,17 +40,17 @@ namespace com { namespace sun { namespace star {
     namespace text { class XTextCursor; }
     namespace text { class XTextField; }
     namespace uno { class XComponentContext; }
-    namespace xml { namespace dom { class XDocument; } }
-    namespace xml { namespace sax { class XFastSAXSerializable; } }
-} } }
+    namespace xml::dom { class XDocument; }
+    namespace xml::sax { class XFastSAXSerializable; }
+}
 
 namespace oox {
     namespace drawingml { class Theme; }
-    namespace drawingml { namespace chart { class ChartConverter; } }
-    namespace drawingml { namespace table {
+    namespace drawingml::chart { class ChartConverter; }
+    namespace drawingml::table {
         class TableStyleList;
         typedef std::shared_ptr< TableStyleList > TableStyleListPtr;
-    } }
+    }
     namespace vml { class Drawing; }
 }
 
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index 10a971182c8b..7919fa7a40f3 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -20,14 +20,14 @@
 #include <oox/crypto/CryptoEngine.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct NamedValue; }
     namespace io { class XInputStream; }
     namespace io { class XStream; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace oox { namespace ole { class OleStorage; } }
+namespace oox::ole { class OleStorage; }
 
 namespace oox {
 namespace core {
diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx
index 03ad719d7c99..9be7c99bb41c 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -17,11 +17,11 @@
 #include <oox/crypto/Standard2007Engine.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XStream; }
-} } }
+}
 
-namespace oox { namespace ole { class OleStorage; } }
+namespace oox::ole { class OleStorage; }
 
 namespace oox {
 namespace core {
diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx
index d4371c6f9c7b..a950cbcb789e 100644
--- a/include/oox/drawingml/chart/chartconverter.hxx
+++ b/include/oox/drawingml/chart/chartconverter.hxx
@@ -24,16 +24,16 @@
 #include <oox/dllapi.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Point; }
     namespace awt { struct Size; }
     namespace drawing { class XShapes; }
     namespace chart2 { class XChartDocument; }
-    namespace chart2 { namespace data { class XDataProvider; } }
-    namespace chart2 { namespace data { class XDataSequence; } }
-} } }
+    namespace chart2::data { class XDataProvider; }
+    namespace chart2::data { class XDataSequence; }
+}
 
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index 80c932b44a1e..21553aafe2fe 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -31,7 +31,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/color.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 enum PredefinedClrSchemeId {
     //dk1,
@@ -90,7 +90,7 @@ public:
             ::Color& rColor) const;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
 
diff --git a/include/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx
index 4b897942394e..1efdd2e40611 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -27,9 +27,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class ContextHandler2Helper; } }
+namespace oox::core { class ContextHandler2Helper; }
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class OOX_DLLPUBLIC ConnectorShapeContext final : public ShapeContext
 {
@@ -39,7 +39,7 @@ public:
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
 
diff --git a/include/oox/drawingml/diagram/diagram.hxx b/include/oox/drawingml/diagram/diagram.hxx
index a5f69b4d56bd..77cef9a88323 100644
--- a/include/oox/drawingml/diagram/diagram.hxx
+++ b/include/oox/drawingml/diagram/diagram.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xml/dom/XDocument.hpp>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class DiagramData;
 typedef std::shared_ptr<DiagramData> DiagramDataPtr;
@@ -56,7 +56,7 @@ void loadDiagram(ShapePtr const& pShape,
 
 OOX_DLLPUBLIC void reloadDiagram(SdrObject* pObj, core::XmlFilterBase& rFilter);
 
-} }
+}
 
 #endif
 
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 5e3517b58524..0aac648ad5a4 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -35,10 +35,10 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace drawing { struct Hatch; }
-    namespace xml { namespace sax { class XFastAttributeList; } }
-} } }
+    namespace xml::sax { class XFastAttributeList; }
+}
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx
index 655e15a31ea3..4813d5fc9aed 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -28,10 +28,10 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class ContextHandler2Helper; } }
-namespace oox { namespace vml { struct OleObjectInfo; } }
+namespace oox::core { class ContextHandler2Helper; }
+namespace oox::vml { struct OleObjectInfo; }
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class OOX_DLLPUBLIC GraphicShapeContext : public ShapeContext
 {
@@ -103,7 +103,7 @@ private:
 };
 
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
 
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 53290f0cbbdb..b1f15e5b6ece 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -39,22 +39,22 @@
 
 namespace basegfx { class B2DHomMatrix; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Rectangle; }
     namespace drawing { class XShape; }
     namespace drawing { class XShapes; }
     namespace uno { class Any; }
-} } }
+}
 
-namespace oox { namespace core {
+namespace oox::core {
     class XmlFilterBase;
-} }
+}
 
-namespace oox { namespace vml {
+namespace oox::vml {
     struct OleObjectInfo;
-} }
+}
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class Theme;
 struct EffectProperties;
@@ -379,7 +379,7 @@ private:
     bool mbUseBgFill = false;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_SHAPE_HXX
 
diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx
index 15684323ca9f..170f50403d0a 100644
--- a/include/oox/drawingml/shapecontext.hxx
+++ b/include/oox/drawingml/shapecontext.hxx
@@ -28,7 +28,7 @@
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class OOX_DLLPUBLIC ShapeContext : public ::oox::core::ContextHandler2
 {
@@ -46,7 +46,7 @@ protected:
     ShapePtr mpShapePtr;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
 
diff --git a/include/oox/drawingml/shapegroupcontext.hxx b/include/oox/drawingml/shapegroupcontext.hxx
index 4fa313493d3e..3e458927d9d5 100644
--- a/include/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
@@ -28,7 +28,7 @@
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class OOX_DLLPUBLIC ShapeGroupContext : public ::oox::core::FragmentHandler2
 {
@@ -41,7 +41,7 @@ protected:
     ShapePtr            mpGroupShapePtr;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
 
diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index bde25e748ba8..3d43cca9af80 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -31,9 +31,9 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace dom { class XDocument; } }
-} } }
+namespace com::sun::star {
+    namespace xml::dom { class XDocument; }
+}
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx
index b83541e7d154..56db23f6929c 100644
--- a/include/oox/drawingml/themefragmenthandler.hxx
+++ b/include/oox/drawingml/themefragmenthandler.hxx
@@ -27,7 +27,7 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 5ad5f948f4cf..44bca5476b2e 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -42,20 +42,20 @@
 
 #ifdef DBG_UTIL
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
     namespace io { class XTextOutputStream2; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
     class TextInputStream;
 }
 
-namespace oox { namespace core {
+namespace oox::core {
     class FilterBase;
-} }
+}
 
 namespace oox {
 namespace dump {
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index 7dfe26dc24c9..bab5eb4a077f 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -34,9 +34,9 @@
 
 #ifdef DBG_UTIL
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
-} } }
+}
 
 namespace oox {
 namespace dump {
diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx
index 158834077dc0..01cda8e6bd0f 100644
--- a/include/oox/dump/pptxdumper.hxx
+++ b/include/oox/dump/pptxdumper.hxx
@@ -26,12 +26,12 @@
 
 #ifdef DBG_UTIL
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace oox { namespace core { class FilterBase; } }
+namespace oox::core { class FilterBase; }
 
 namespace oox {
 namespace dump {
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index 2b3353173520..7709cf46213f 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -27,17 +27,17 @@
 
 #ifdef DBG_UTIL
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
     class BinaryInputStream;
     class SequenceInputStream;
 }
 
-namespace oox { namespace core { class FilterBase; } }
+namespace oox::core { class FilterBase; }
 
 namespace oox {
 namespace dump {
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index c3ce9fd99a9d..39c446fac4aa 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -33,7 +33,7 @@
 #include <sal/types.h>
 #include <sax/fshelper.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         class XPropertySet;
     }
@@ -60,14 +60,14 @@ namespace com { namespace sun { namespace star {
     namespace frame {
         class XModel;
     }
-}}}
+}
 
 namespace oox {
 namespace core {
     class XmlFilterBase;
 }}
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 enum AxesType
 {
@@ -231,7 +231,7 @@ public:
             css::chart2::XChartDocument > & xChartDoc );
 };
 
-}}
+}
 
 #endif // INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX
 
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 7d71f6f3e02c..aedd408abe28 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -46,7 +46,7 @@
 class Graphic;
 class SdrObjCustomShape;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 namespace awt {
     struct FontDescriptor;
     struct Gradient;
@@ -80,7 +80,7 @@ namespace uno {
 namespace frame {
     class XModel;
 }
-}}}
+}
 
 struct EscherConnectorListEntry;
 class OutlinerParaObject;
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index a8ea2d5c6005..2dbbb658c036 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -36,7 +36,7 @@
 #include <tools/fract.hxx>
 #include <vcl/mapmod.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 namespace beans {
     class XPropertySet;
 }
@@ -54,7 +54,7 @@ namespace uno {
     class XComponentContext;
     class XInterface;
 }
-}}}
+}
 
 namespace oox {
 namespace core {
@@ -76,7 +76,7 @@ OOX_DLLPUBLIC css::uno::Reference<css::io::XInputStream> GetOLEObjectStream(
 
 }
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class OOX_DLLPUBLIC ShapeExport : public DrawingML {
 
@@ -203,7 +203,7 @@ public:
     static sal_Int32 GetShapeID( const css::uno::Reference< css::drawing::XShape >& rShape, ShapeHashMap* pShapeMap );
 };
 
-}}
+}
 
 #endif // INCLUDED_OOX_EXPORT_SHAPES_HXX
 
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 4e9fa9866341..510505aa3d84 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -66,9 +66,9 @@ OString write1000thOfAPercent(T number)
     return OString::number( lround(number * 1000.0) );
 }
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
     enum DocumentType { DOCUMENT_DOCX, DOCUMENT_PPTX, DOCUMENT_XLSX };
-} }
+}
 
 #endif
 
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 83b5b91c0d41..61185e57d5de 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -31,11 +31,11 @@
 #include <sax/fshelper.hxx>
 #include <vcl/checksum.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace drawing {
         class XShape;
     }
-}}}
+}
 
 namespace oox {
     namespace drawingml {
diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx
index 0bf70a0f98ce..43808761c922 100644
--- a/include/oox/helper/attributelist.hxx
+++ b/include/oox/helper/attributelist.hxx
@@ -30,9 +30,9 @@
 #include <sal/types.h>
 #include <oox/drawingml/color.hxx>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XFastAttributeList; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XFastAttributeList; }
+}
 
 namespace sax_fastparser {
     class FastAttributeList;
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index af6a6240fffc..e27b2def9c9c 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -33,9 +33,9 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index cf3a964de8bd..571b23aa8c80 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -31,9 +31,9 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XOutputStream; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index f5302d470738..8e93d1458620 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -25,9 +25,9 @@
 #include <oox/dllapi.h>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XSeekable; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx
index 81fb69a009d3..1bc5ee17f0d8 100644
--- a/include/oox/helper/containerhelper.hxx
+++ b/include/oox/helper/containerhelper.hxx
@@ -29,11 +29,11 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XNameAccess; }
     namespace container { class XNameContainer; }
     namespace uno { class Any; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/grabbagstack.hxx b/include/oox/helper/grabbagstack.hxx
index de6802ecc1b5..bd03535c9aa6 100644
--- a/include/oox/helper/grabbagstack.hxx
+++ b/include/oox/helper/grabbagstack.hxx
@@ -19,9 +19,9 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { class Any; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index 4854985d1014..301bc37e27af 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -34,7 +34,7 @@
 
 struct WmfExternal;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Point; }
     namespace awt { struct Size; }
     namespace awt { class XUnitConversion; }
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star {
     namespace graphic { class XGraphicObject; }
     namespace graphic { class XGraphicProvider; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx
index 2b9e1d2cfd51..dd6100b33311 100644
--- a/include/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Gradient;
                     class XBitmap; }
     namespace graphic { class XGraphic; }
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
     namespace drawing { struct Hatch; }
     namespace drawing { struct PolyPolygonBezierCoords; }
     namespace lang { class XMultiServiceFactory; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index a19696b7596c..e1c5c0a99699 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -26,9 +26,9 @@
 #include <oox/dllapi.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace task { class XStatusIndicator; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx
index 30d77ec0bfa4..db7b0297d680 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -30,10 +30,10 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct PropertyValue;
     class XPropertySet;
-} } } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx
index 11d044e5ff3a..f729a29fb17b 100644
--- a/include/oox/helper/propertyset.hxx
+++ b/include/oox/helper/propertyset.hxx
@@ -28,11 +28,11 @@
 #include <sal/types.h>
 #include <tools/color.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XMultiPropertySet; }
     namespace beans { class XPropertySet; }
     namespace beans { class XPropertySetInfo; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx
index 537517fbff73..2722ed80bc3a 100644
--- a/include/oox/helper/storagebase.hxx
+++ b/include/oox/helper/storagebase.hxx
@@ -29,12 +29,12 @@
 #include <oox/helper/refmap.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace embed { class XStorage; }
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
     namespace io { class XStream; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx
index d059c88e8839..4a5bcdbfe994 100644
--- a/include/oox/helper/textinputstream.hxx
+++ b/include/oox/helper/textinputstream.hxx
@@ -25,11 +25,11 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
     namespace io { class XTextInputStream2; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index bd5cf28335bd..dec4b483ea3f 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -26,13 +26,13 @@
 #include <oox/helper/storagebase.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace embed { class XStorage; }
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
     namespace io { class XStream; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
 
diff --git a/include/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx
index 448262f001d0..7120acb3948a 100644
--- a/include/oox/mathml/importutils.hxx
+++ b/include/oox/mathml/importutils.hxx
@@ -18,9 +18,9 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XFastAttributeList; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XFastAttributeList; }
+}
 
 namespace oox
 {
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index 427f47cc85f6..5f264fe469a5 100644
--- a/include/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
@@ -30,7 +30,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { namespace ole { struct AxFontData; } }
+namespace oox::ole { struct AxFontData; }
 
 namespace oox {
 namespace ole {
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 7e4e4fda5347..db14305cae9d 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -34,14 +34,14 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { class XControlModel; }
     namespace container { class XIndexContainer; }
     namespace drawing { class XDrawPage; }
     namespace frame { class XModel; }
     namespace form { class XFormsSupplier; }
     namespace lang { class XMultiServiceFactory; }
-} } }
+}
 
 namespace oox {
     class BinaryInputStream;
diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx
index 49c71d4bfca1..e3929a8979aa 100644
--- a/include/oox/ole/axcontrolfragment.hxx
+++ b/include/oox/ole/axcontrolfragment.hxx
@@ -27,7 +27,7 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
 namespace oox {
 namespace ole {
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 5717b87045af..8be904fd3d23 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -30,14 +30,14 @@
 #include <tools/ref.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { class XControlModel; }
     namespace awt { struct Size; }
     namespace form { class XFormComponent; }
     namespace frame { class XModel; }
     namespace io { class XOutputStream; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 class SotStorage;
 class SotStorageStream;
diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx
index 19f07cf5f9c0..1a5b1b67a044 100644
--- a/include/oox/ole/oleobjecthelper.hxx
+++ b/include/oox/ole/oleobjecthelper.hxx
@@ -26,12 +26,12 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Size; }
     namespace document { class XEmbeddedObjectResolver; }
     namespace frame { class XModel; }
     namespace lang { class XMultiServiceFactory; }
-} } }
+}
 
 namespace oox { class PropertyMap; }
 
diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx
index e9999668ca12..de40a1395182 100644
--- a/include/oox/ole/olestorage.hxx
+++ b/include/oox/ole/olestorage.hxx
@@ -27,14 +27,14 @@
 #include <oox/helper/storagebase.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XNameContainer; }
     namespace embed { class XStorage; }
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
     namespace io { class XStream; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
 namespace ole {
diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx
index 05f1321400bc..6e40f6a881c9 100644
--- a/include/oox/ole/vbacontrol.hxx
+++ b/include/oox/ole/vbacontrol.hxx
@@ -30,12 +30,12 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { class XControlModel; }
     namespace container { class XNameContainer; }
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
     class BinaryInputStream;
diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx
index e30189dc5d12..6d2bda3e19ef 100644
--- a/include/oox/ole/vbaexport.hxx
+++ b/include/oox/ole/vbaexport.hxx
@@ -21,11 +21,11 @@ class SotStorage;
 class SvStream;
 class SvMemoryStream;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XNameContainer; }
     namespace frame { class XModel; }
     namespace script { class XLibraryContainer; }
-} } }
+}
 
 class OOX_DLLPUBLIC VbaExport
 {
diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx
index cb3682839c90..97034ec8e8f5 100644
--- a/include/oox/ole/vbamodule.hxx
+++ b/include/oox/ole/vbamodule.hxx
@@ -25,12 +25,12 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XNameAccess; }
     namespace container { class XNameContainer; }
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
     class BinaryInputStream;
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index e0266cb1f217..c3ad3a970c9a 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -30,15 +30,15 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XNameContainer; }
     namespace frame { class XModel; }
     namespace script { class XLibraryContainer; }
-    namespace script { namespace vba { class XVBAMacroResolver; } }
+    namespace script::vba { class XVBAMacroResolver; }
     namespace uno { class XComponentContext; }
     namespace uno { class XInterface; }
     namespace io { class XInputStream; }
-} } }
+}
 
 namespace oox {
     class GraphicHelper;
diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx
index aa808b4908fc..0dcf0dc0662a 100644
--- a/include/oox/ppt/animationspersist.hxx
+++ b/include/oox/ppt/animationspersist.hxx
@@ -31,7 +31,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     enum {
         NP_TO = 0,
@@ -115,7 +115,7 @@ namespace oox { namespace ppt {
 
     typedef ::std::vector< TimeAnimationValue > TimeAnimationValueList;
 
-} }
+}
 
 
 #endif
diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx
index 4651b14da482..35a209b3067d 100644
--- a/include/oox/ppt/backgroundproperties.hxx
+++ b/include/oox/ppt/backgroundproperties.hxx
@@ -25,9 +25,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace drawingml { struct FillProperties; } }
+namespace oox::drawingml { struct FillProperties; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 
 class BackgroundPropertiesContext final : public ::oox::core::FragmentHandler2
@@ -40,7 +40,7 @@ private:
     ::oox::drawingml::FillProperties& mrFillProperties;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
 
diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index 781820b7a0b5..10cad1270a1c 100644
--- a/include/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
@@ -17,7 +17,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 struct CommentAuthor
 {
@@ -110,7 +110,7 @@ class CommentList
         const Comment& getCommentAtIndex (int index);
 };
 
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx
index f49924deeba8..d79cfc6370e2 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -29,7 +29,7 @@
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 
     struct CustomShow
@@ -52,7 +52,7 @@ namespace oox { namespace ppt {
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
     };
 
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/headerfooter.hxx b/include/oox/ppt/headerfooter.hxx
index 55203a7742eb..e304f3c6e7d7 100644
--- a/include/oox/ppt/headerfooter.hxx
+++ b/include/oox/ppt/headerfooter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_PPT_HEADERFOOTER_HXX
 #define INCLUDED_OOX_PPT_HEADERFOOTER_HXX
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     struct HeaderFooter
     {
@@ -36,7 +36,7 @@ namespace oox { namespace ppt {
         , mbDateTime( true ) {};
     };
 
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx
index 1e4c0603cf10..41fb7a85bd78 100644
--- a/include/oox/ppt/layoutfragmenthandler.hxx
+++ b/include/oox/ppt/layoutfragmenthandler.hxx
@@ -27,9 +27,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class LayoutFragmentHandler final : public SlideFragmentHandler
 {
@@ -41,7 +41,7 @@ public:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_LAYOUTFRAGMENTHANDLER_HXX
 
diff --git a/include/oox/ppt/pptfilterhelpers.hxx b/include/oox/ppt/pptfilterhelpers.hxx
index aceb34552b7b..35372e6fe3e2 100644
--- a/include/oox/ppt/pptfilterhelpers.hxx
+++ b/include/oox/ppt/pptfilterhelpers.hxx
@@ -26,11 +26,11 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace animations { class XAnimationNode; }
-} } }
+}
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     // conversion of MS to OOo attributes.
     enum class AnimationAttributeEnum
@@ -92,7 +92,7 @@ namespace oox { namespace ppt {
      * i.e. convert occurrence of #{0,1}ppt_[xywh] to x,y, width, height.
      */
     OOX_DLLPUBLIC bool convertMeasure(OUString& rString);
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx
index f2d4e4d63177..bdc1f7d77c20 100644
--- a/include/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
@@ -27,9 +27,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class ContextHandler2Helper; } }
+namespace oox::core { class ContextHandler2Helper; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTGraphicShapeContext final : public ::oox::drawingml::GraphicShapeContext
 {
@@ -40,7 +40,7 @@ public:
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
 
-} }
+}
 
 #endif  //  OOX_PPT_PPTGRAPHICSHAPEGROUPCONTEXT_HXX
 
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 2ea62da02c1b..28ae6df51da6 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -34,19 +34,19 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
     class GraphicHelper;
-    namespace drawingml { namespace chart { class ChartConverter; } }
+    namespace drawingml::chart { class ChartConverter; }
     namespace ole { class VbaProject; }
     namespace vml { class Drawing; }
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 
 class PowerPointImport final : public oox::core::XmlFilterBase
@@ -99,7 +99,7 @@ private:
     std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTIMPORT_HXX
 
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index 040851494cde..f452e585abcf 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -31,10 +31,10 @@
 
 namespace basegfx { class B2DHomMatrix; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Rectangle; }
     namespace drawing { class XShapes; }
-} } }
+}
 
 namespace oox {
     namespace core { class XmlFilterBase; }
@@ -42,7 +42,7 @@ namespace oox {
     template <typename Type> class OptValue;
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTShape final : public oox::drawingml::Shape
 {
@@ -82,7 +82,7 @@ public:
     static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const SlidePersist& rSlidePersist, sal_Int32 nSubType );
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTSHAPE_HXX
 
diff --git a/include/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx
index 334904931fe2..5d5277502763 100644
--- a/include/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
@@ -27,9 +27,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class ContextHandler2Helper; } }
+namespace oox::core { class ContextHandler2Helper; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTShapeContext final : public ::oox::drawingml::ShapeContext
 {
@@ -40,7 +40,7 @@ public:
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx
index 73f0cb226cd2..89f8ca65d1fd 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -32,7 +32,7 @@ namespace oox {
     namespace drawingml { class Color; }
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTShapeGroupContext final : public ::oox::drawingml::ShapeGroupContext
 {
@@ -59,7 +59,7 @@ protected:
 
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx
index 06d4cec1461b..124d7545d666 100644
--- a/include/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
@@ -30,7 +30,7 @@ namespace oox {
     namespace drawingml { class Shape; }
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTShapePropertiesContext final : public ::oox::drawingml::ShapePropertiesContext
 {
@@ -40,7 +40,7 @@ public:
         onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
 
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index bb9166e24afc..4ec27efe28bf 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -34,9 +34,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PresentationFragmentHandler final : public ::oox::core::FragmentHandler2
 {
@@ -66,7 +66,7 @@ private:
     bool                        mbCommentAuthorsRead; // read commentAuthors.xml only once
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PRESENTATIONFRAGMENTHANDLER_HXX
 
diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx
index 2308816a418c..b7d1d59b32ba 100644
--- a/include/oox/ppt/slidefragmenthandler.hxx
+++ b/include/oox/ppt/slidefragmenthandler.hxx
@@ -30,9 +30,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class SlideFragmentHandler : public ::oox::core::FragmentHandler2
 {
@@ -56,7 +56,7 @@ private:
     ::std::vector< OUString> maCharVector; // handle char in OnCharacters
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDEFRAGMENTHANDLER_HXX
 
diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx
index 7acab9888158..4d051ab8e4ff 100644
--- a/include/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
@@ -27,7 +27,7 @@
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class SlideMasterTextStylesContext final : public oox::core::FragmentHandler2
 {
@@ -40,7 +40,7 @@ private:
     SlidePersistPtr     mpSlidePersistPtr;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
 
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 383bc501abc5..3dd9d65977b0 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -35,15 +35,15 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace animations { class XAnimationNode; }
     namespace drawing { class XDrawPage; }
-} } }
+}
 
-namespace oox { namespace core { class XmlFilterBase; } }
-namespace oox { namespace vml { class Drawing; } }
+namespace oox::core { class XmlFilterBase; }
+namespace oox::vml { class Drawing; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 enum ShapeLocation
 {
@@ -157,7 +157,7 @@ private:
     CommentAuthorList                                                       maCommentAuthors;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
 
diff --git a/include/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx
index 4cdd4998e37d..6b32b2e23c9a 100644
--- a/include/oox/ppt/slidetimingcontext.hxx
+++ b/include/oox/ppt/slidetimingcontext.hxx
@@ -27,7 +27,7 @@
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class SlideTimingContext final : public ::oox::core::FragmentHandler2
 {
@@ -41,7 +41,7 @@ private:
     TimeNodePtrList & maTimeNodeList;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDETIMINGCONTEXT_HXX
 
diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx
index 02914cb2f3e9..662b9032dacd 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -26,13 +26,13 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace animations { class XTransitionFilter; }
-} } }
+}
 
 namespace oox { class PropertyMap; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     class SlideTransition
     {
@@ -74,7 +74,7 @@ namespace oox { namespace ppt {
         ::sal_Int32 mnAdvanceTime;
     };
 
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx
index 501780fb96eb..1c0755ab171b 100644
--- a/include/oox/ppt/slidetransitioncontext.hxx
+++ b/include/oox/ppt/slidetransitioncontext.hxx
@@ -30,7 +30,7 @@ namespace oox {
     class PropertyMap;
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     class SlideTransitionContext final : public ::oox::core::FragmentHandler2
     {
@@ -51,7 +51,7 @@ namespace oox { namespace ppt {
         SlideTransition                 maTransition;
     };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDETRANSITIONCONTEXT_HXX
 
diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx
index 686e00e19956..81e7e81510b1 100644
--- a/include/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
@@ -31,7 +31,7 @@ namespace oox {
     class PropertyMap;
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class SoundActionContext final : public ::oox::core::FragmentHandler2
 {
@@ -50,7 +50,7 @@ private:
     OUString                   msSndName;
 };
 
-} }
+}
 
 
 #endif
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index 6d8ab4794c46..195e4472ed85 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -33,13 +33,13 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace animations { class XAnimationNode; }
-} } }
+}
 
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     class TimeNode;
 
@@ -120,7 +120,7 @@ namespace oox { namespace ppt {
         AnimationConditionList     maPrevCondList, maNextCondList;
     };
 
-} }
+}
 
 
 #endif
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index 2ecd1ec6d7a9..8bc76b3c185d 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -26,13 +26,13 @@
 #include <oox/ppt/timenode.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XFastAttributeList; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XFastAttributeList; }
+}
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 
     class TimeNodeContext : public ::oox::core::FragmentHandler2
@@ -64,7 +64,7 @@ private:
     TimeNodePtrList & maList;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_TIMENODELISTCONTEXT_HXX
 
diff --git a/include/oox/shape/ShapeFilterBase.hxx b/include/oox/shape/ShapeFilterBase.hxx
index b5b90ddafa37..e3f95ccebeeb 100644
--- a/include/oox/shape/ShapeFilterBase.hxx
+++ b/include/oox/shape/ShapeFilterBase.hxx
@@ -26,12 +26,12 @@
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableStyleList;
 typedef std::shared_ptr< TableStyleList > TableStyleListPtr;
 
-}}}
+}
 
 namespace oox {
 namespace shape {
diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx
index 40c3ba20de90..9181b7356613 100644
--- a/include/oox/vml/vmldrawing.hxx
+++ b/include/oox/vml/vmldrawing.hxx
@@ -30,12 +30,12 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Rectangle; }
     namespace drawing { class XDrawPage; }
     namespace drawing { class XShape; }
     namespace drawing { class XShapes; }
-} } }
+}
 
 namespace oox {
     namespace core { class XmlFilterBase; }
diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx
index acf1aa6c83d1..be20dc2f875e 100644
--- a/include/oox/vml/vmldrawingfragment.hxx
+++ b/include/oox/vml/vmldrawingfragment.hxx
@@ -27,12 +27,12 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
-} } }
+}
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
 namespace oox {
 namespace vml {
diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx
index c024bec8bfef..f4b6d88c58e1 100644
--- a/include/oox/vml/vmlformatting.hxx
+++ b/include/oox/vml/vmlformatting.hxx
@@ -30,10 +30,10 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Point; }
     namespace drawing { class XShape; }
-} } }
+}
 
 namespace oox {
     class GraphicHelper;
diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx
index f9b40ec71d77..ca2fb68dbb00 100644
--- a/include/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
@@ -28,10 +28,10 @@
 #include <rtl/string.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XTextInputStream2; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
 namespace vml {
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index a4584cad2b7f..9812bce8cfcf 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -31,12 +31,12 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Rectangle; }
     namespace drawing { class XShape; }
     namespace drawing { class XShapes; }
     namespace graphic { class XGraphic; }
-} } }
+}
 
 namespace oox {
 namespace vml {
diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx
index 1b72c8a38f3b..8a33ef436f07 100644
--- a/include/oox/vml/vmlshapecontainer.hxx
+++ b/include/oox/vml/vmlshapecontainer.hxx
@@ -31,9 +31,9 @@
 #include <oox/helper/refvector.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace drawing { class XShapes; }
-} } }
+}
 
 namespace oox {
 namespace vml {
diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index 8c3fad709ac0..7f7710bcbb76 100644
--- a/include/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
@@ -29,9 +29,9 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace drawing { class XShape; }
-} } }
+}
 
 namespace oox {
 namespace vml {
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 1c89afeb04cb..f937ab1abb4f 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -28,9 +28,9 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastTokenHandler; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { struct Attribute; } } } }
-namespace com { namespace sun { namespace star { namespace xml { struct FastAttribute; } } } }
+namespace com::sun::star::xml::sax { class XFastTokenHandler; }
+namespace com::sun::star::xml { struct Attribute; }
+namespace com::sun::star::xml { struct FastAttribute; }
 
 namespace sax_fastparser
 {
diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx
index f9776c595831..a7f1e0c015f9 100644
--- a/include/sax/fastparser.hxx
+++ b/include/sax/fastparser.hxx
@@ -28,12 +28,10 @@
 #include <sax/fastsaxdllapi.h>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace xml { namespace sax {
-
-class XFastDocumentHandler;
-class XFastTokenHandler;
-
-}}}}}
+namespace com::sun::star::xml::sax {
+    class XFastDocumentHandler;
+    class XFastTokenHandler;
+}
 
 namespace sax_fastparser {
 
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 773ce6892e26..7c1f9a2ea1af 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -27,7 +27,7 @@
 #include <memory>
 #include <utility>
 
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+namespace com::sun::star::io { class XOutputStream; }
 namespace sax_fastparser { class FastAttributeList; }
 
 constexpr sal_Int32 FSNS(sal_Int32 namespc, sal_Int32 element) { return (namespc << 16) | element; }
diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index bb1e66e25ec0..9f7f5b3df50f 100644
--- a/include/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <tools/color.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class Any;
     }
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star {
         struct DateTime;
         struct Duration;
     }
-} } }
+}
 
 namespace sax {
 
diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx
index 8e77f2831d25..196676671f9d 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -39,12 +39,12 @@
     protected externally.
  */
 
-namespace com { namespace sun { namespace star { namespace embed {
+namespace com::sun::star::embed {
     class XStorage;
-} } } }
-namespace com { namespace sun { namespace star { namespace frame {
+}
+namespace com::sun::star::frame {
     class XModel;
-} } } }
+}
 
 namespace com::sun::star::uno { class XComponentContext; }
 
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index bd9f3bb659fe..a84bddb899b1 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -29,9 +29,9 @@
 #include <memory>
 
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame { class XModel; }
-} } }
+}
 
 namespace sfx2 {
     class IXmlIdRegistry;
diff --git a/include/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx
index 6846bfcab535..7cae9df1e7ca 100644
--- a/include/sfx2/XmlIdRegistry.hxx
+++ b/include/sfx2/XmlIdRegistry.hxx
@@ -28,9 +28,9 @@
 namespace com::sun::star::beans { struct StringPair; }
 namespace com::sun::star::uno { template <typename > class Reference; }
 
-namespace com { namespace sun { namespace star { namespace rdf {
+namespace com::sun::star::rdf {
     class XMetadatable;
-} } } }
+}
 
 namespace sfx2 {
 
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index cdc141e5a442..09e2473b9ed0 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -40,11 +40,11 @@
 
 namespace com::sun::star::beans { struct PropertyValue; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document {
         class XDocumentProperties;
     }
-} } }
+}
 
 struct CustomProperty;
 class SvtCalendarBox;
diff --git a/include/sfx2/docinf.hxx b/include/sfx2/docinf.hxx
index 23cca9ce1025..09ecfff6bdf5 100644
--- a/include/sfx2/docinf.hxx
+++ b/include/sfx2/docinf.hxx
@@ -28,11 +28,11 @@
 class GDIMetaFile;
 class SotStorage;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document {
         class XDocumentProperties;
     }
-} } }
+}
 
 namespace com::sun::star::uno { template <typename > class Reference; }
 namespace com::sun::star::uno { template <typename > class Sequence; }
diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index 02f2fdbeac63..dfc0d1645d35 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
@@ -26,11 +26,11 @@
 
 class SvStream;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document {
         class XDocumentProperties;
     }
-} } }
+}
 
 namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::uno { template <class interface_type> class Reference; }
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index 3648f0f1f7b2..4940a0a18625 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -30,11 +30,11 @@
 class SfxObjectShell;
 class Graphic;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang {
         class XComponent;
     }
-}}}
+}
 
 namespace weld { class Window; }
 
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index b4f21227704e..4f12d72f4a14 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
@@ -26,10 +26,10 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno
+namespace com::sun::star::uno
 {
     class Any;
-}}}}
+}
 namespace weld { class Window; }
 
 template <typename Arg, typename Ret> class Link;
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index ca29ebe3547e..332702b8893f 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -28,10 +28,10 @@
 #include <tools/link.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno
+namespace com::sun::star::uno
 {
     class Any;
-}}}}
+}
 
 namespace com::sun::star::io { class XInputStream; }
 
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 6f9777aca7cb..fbffbc6ade78 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -39,9 +39,9 @@ class SfxTbxCtrlFactArr_Impl;
 class SfxStbCtrlFactArr_Impl;
 class SfxChildWinFactArr_Impl;
 
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
     class XFrame;
-} } } }
+}
 
 namespace weld {
     class Container;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 08f15270197f..568b0397f43b 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -97,7 +97,7 @@ namespace com::sun::star::security { class XDocumentDigitalSignatures; }
 namespace com::sun::star::security { struct DocumentSignatureInformation; }
 namespace com::sun::star::task { class XInteractionHandler; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document {
         class XDocumentProperties;
     }
@@ -107,7 +107,7 @@ namespace com { namespace sun { namespace star {
     namespace text {
         class XTextRange;
     }
-} } }
+}
 
 namespace sfx2 { class IXmlIdRegistry; }
 
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 5ee900b8d852..8fa52fbfa977 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -72,9 +72,9 @@ class   SfxObjectShell                      ;
 class   SfxViewFrame;
 struct  IMPL_SfxBaseModel_DataContainer     ;   // impl. struct to hold member of class SfxBaseModel
 
-namespace sfx { namespace intern {
+namespace sfx::intern {
     class ViewCreationGuard;
-} }
+}
 
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::container { class XNameContainer; }
diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx
index 490e2d8548f0..675e53b58dac 100644
--- a/include/sfx2/sidebar/AsynchronousCall.hxx
+++ b/include/sfx2/sidebar/AsynchronousCall.hxx
@@ -25,7 +25,7 @@
 
 struct ImplSVEvent;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** A simple asynchronous call via Application::PostUserCall.
 */
@@ -48,7 +48,7 @@ private:
     DECL_LINK(HandleUserCall, void*, void);
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx
index 001a70e26b90..b69838a8fd41 100644
--- a/include/sfx2/sidebar/Context.hxx
+++ b/include/sfx2/sidebar/Context.hxx
@@ -21,7 +21,7 @@
 
 #include <rtl/ustring.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class Context
 {
@@ -54,7 +54,7 @@ public:
     bool operator!= (const Context& rOther) const;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 71f7cd84c8b6..ef75d0dc9f68 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -24,7 +24,7 @@
 namespace com::sun::star::lang { class XComponent; }
 
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** The sfx2::sidebar::ControllerItem is a wrapper around the
     SfxControllerItem that becomes necessary to allow objects (think
@@ -75,7 +75,7 @@ private:
     ItemUpdateReceiverInterface& mrItemUpdateReceiver;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 79815a9bb283..21e7dfad5be7 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -25,7 +25,7 @@
 
 class ScrollBar;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class DeckDescriptor;
 class DeckTitleBar;
@@ -104,7 +104,7 @@ private:
 
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/FocusManager.hxx b/include/sfx2/sidebar/FocusManager.hxx
index 5bbb3b0441fe..afd32d01716d 100644
--- a/include/sfx2/sidebar/FocusManager.hxx
+++ b/include/sfx2/sidebar/FocusManager.hxx
@@ -25,7 +25,7 @@
 
 class Button;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class DeckTitleBar;
 
@@ -142,7 +142,7 @@ private:
 
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx
index a36bb21de4e5..c3138c3f369b 100644
--- a/include/sfx2/sidebar/IContextChangeReceiver.hxx
+++ b/include/sfx2/sidebar/IContextChangeReceiver.hxx
@@ -24,7 +24,7 @@
 namespace vcl { class EnumContext; }
 
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 
 class SFX2_DLLPUBLIC IContextChangeReceiver
@@ -35,7 +35,7 @@ public:
     virtual void HandleContextChange (const vcl::EnumContext& rContext) = 0;
 };
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sd::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx
index ce8b12eccf1c..cb78ec5ad384 100644
--- a/include/sfx2/sidebar/ILayoutableWindow.hxx
+++ b/include/sfx2/sidebar/ILayoutableWindow.hxx
@@ -23,7 +23,7 @@
 #include <sal/types.h>
 #include <com/sun/star/ui/LayoutSize.hpp>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 
 class SFX2_DLLPUBLIC ILayoutableWindow
@@ -38,7 +38,7 @@ public:
 };
 
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sd::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index 3fe5a4dbcfed..cae82bbc1d08 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -30,7 +30,7 @@ namespace com::sun::star::ui { class XSidebarPanel; }
 namespace com::sun::star::ui { class XUIElement; }
 namespace com::sun::star::awt { class XWindow; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class PanelDescriptor;
 class PanelTitleBar;
@@ -87,7 +87,7 @@ private:
 };
 typedef std::vector<VclPtr<Panel> > SharedPanelContainer;
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx
index 8d3972c71996..97987ea1a86b 100644
--- a/include/sfx2/sidebar/ResourceManager.hxx
+++ b/include/sfx2/sidebar/ResourceManager.hxx
@@ -26,10 +26,10 @@
 
 namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::frame { class XModel; }
-namespace sfx2 { namespace sidebar { class DeckDescriptor; } }
-namespace sfx2 { namespace sidebar { class PanelDescriptor; } }
+namespace sfx2::sidebar { class DeckDescriptor; }
+namespace sfx2::sidebar { class PanelDescriptor; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class Context;
 class ContextList;
@@ -128,7 +128,7 @@ private:
     std::shared_ptr<PanelDescriptor> ImplGetPanelDescriptor(const OUString& rsPanelId) const;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index 30244f9988b1..2ac3b0e6a425 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -27,7 +27,7 @@ namespace com::sun::star::frame { class XFrame; }
 namespace com::sun::star::uno { template <typename > class Reference; }
 
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** Accept requests for switching to certain panels or decks.
 */
@@ -59,7 +59,7 @@ public:
         const css::uno::Reference<css::frame::XFrame>& rxFrame);
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx
index 7902fddbfad0..6a9254df560f 100644
--- a/include/sfx2/sidebar/SidebarChildWindow.hxx
+++ b/include/sfx2/sidebar/SidebarChildWindow.hxx
@@ -22,7 +22,7 @@
 #include <sfx2/childwin.hxx>
 
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** Outer container of the sidebar window.
 
@@ -42,7 +42,7 @@ public:
 };
 
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index b9fa004f7db2..d03576b3416d 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -54,7 +54,7 @@ typedef cppu::WeakComponentImplHelper <
 
 class SfxSplitWindow;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class DeckDescriptor;
 class SidebarDockingWindow;
@@ -288,7 +288,7 @@ private:
 
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index d9e3a177a5f5..6d726ddd1260 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx
@@ -27,7 +27,7 @@ class SfxViewShell;
 
 namespace svt { class AcceleratorExecute; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class SidebarChildWindow;
 
@@ -71,7 +71,7 @@ private:
     std::unique_ptr<SidebarNotifyIdle> mpIdleNotify;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 
 #endif
diff --git a/include/sfx2/sidebar/SidebarModelUpdate.hxx b/include/sfx2/sidebar/SidebarModelUpdate.hxx
index 3286d7573fe6..0ecb988e5279 100644
--- a/include/sfx2/sidebar/SidebarModelUpdate.hxx
+++ b/include/sfx2/sidebar/SidebarModelUpdate.hxx
@@ -15,7 +15,7 @@
 namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::uno { template <typename > class Reference; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class SFX2_DLLPUBLIC SidebarModelUpdate
 {
@@ -24,7 +24,7 @@ public:
     virtual void updateModel(css::uno::Reference<css::frame::XModel> xModel) = 0;
 };
 
-} }
+}
 
 #endif
 
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index f1cc0e26b93d..84a3e4dfbf3b 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -35,7 +35,7 @@
 
 namespace vcl { class Window; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 typedef cppu::WeakComponentImplHelper<css::ui::XContextChangeEventListener,
                                        css::ui::XUIElement,
@@ -95,7 +95,7 @@ private:
     const css::ui::LayoutSize maLayoutSize;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index b33a074fa267..9eb54744fe5b 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -26,7 +26,7 @@
 
 namespace com::sun::star::frame { class XToolbarController; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** The sidebar tool box has two responsibilities:
     1. Coordinated location, size, and other states with its parent
@@ -78,7 +78,7 @@ protected:
 };
 
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index a37949f10060..0d10efa82e6a 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -35,7 +35,7 @@ class RadioButton;
 
 namespace svt { class AcceleratorExecute; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class FocusManager;
 class SidebarController;
@@ -122,7 +122,7 @@ private:
 };
 
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index e018e029db16..a1500364d7d2 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -34,7 +34,7 @@
 #include <unordered_map>
 
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 typedef cppu::WeakComponentImplHelper <
     css::beans::XPropertySet,
@@ -238,7 +238,7 @@ private:
 };
 
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index ad910e2dd664..b6e8bca39b84 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -25,10 +25,10 @@ class TemplateSearchView;
 class ThumbnailViewItem;
 
 namespace com {
-    namespace sun { namespace star { namespace frame {
+    namespace sun::star::frame {
         class XDesktop2;
         class XModel;
-    }   }   }
+    }
 }
 
 class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public weld::GenericDialogController
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 63441f17d883..243f1f1521ec 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -57,8 +57,8 @@ class NotifyEvent;
 class SfxInPlaceClient;
 namespace vcl { class PrinterController; }
 
-namespace com::sun::star::datatransfer { namespace clipboard { class XClipboardListener; } }
-namespace com::sun::star::datatransfer { namespace clipboard { class XClipboardNotifier; } }
+namespace com::sun::star::datatransfer::clipboard { class XClipboardListener; }
+namespace com::sun::star::datatransfer::clipboard { class XClipboardNotifier; }
 namespace com::sun::star::embed { class XEmbeddedObject; }
 namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::frame { class XModel; }
diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx
index f76cec123b5c..c7fed6d3b851 100644
--- a/include/sot/exchange.hxx
+++ b/include/sot/exchange.hxx
@@ -27,11 +27,11 @@
 #include <sot/formats.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace com { namespace sun { namespace star { namespace datatransfer {
+namespace com::sun::star::datatransfer {
     class XTransferable;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 struct DataFlavorEx : public css::datatransfer::DataFlavor
 {
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 12b2bf22cd06..429ea01ecf7a 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -27,9 +27,9 @@
 #include <sot/sotdllapi.h>
 #include <config_options.h>
 
-namespace com { namespace sun { namespace star { namespace ucb { class XProgressHandler; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::ucb { class XProgressHandler; }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 class StgIo;
 class StgDirEntry;
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 640a04b109ef..4fc2efab42b5 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -27,9 +27,9 @@
 #include <sot/storinfo.hxx>
 #include <sot/sotdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 enum class SotClipboardFormatId : sal_uInt32;
 
diff --git a/include/svl/asiancfg.hxx b/include/svl/asiancfg.hxx
index 30dc1d7bcd0a..6ee88fe3575f 100644
--- a/include/svl/asiancfg.hxx
+++ b/include/svl/asiancfg.hxx
@@ -26,9 +26,9 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svl/svldllapi.h>
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     struct Locale;
-} } } }
+}
 
 /// These constants define character compression in Asian text.
 /// Must match the values in com::sun::star::text::CharacterCompressionType.
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 31a9edea7dee..f35e8a765f13 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -24,8 +24,8 @@
 
 #include <svl/lockfilecommon.hxx>
 
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
 
 namespace svt {
 
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index ec40762b6a43..af4932999dbd 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -24,7 +24,7 @@
 #include <svl/poolitem.hxx>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 class SVL_DLLPUBLIC SfxIntegerListItem final : public SfxPoolItem
 {
diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx
index cc7bc8e9b619..6ddccfeaf3c5 100644
--- a/include/svl/instrm.hxx
+++ b/include/svl/instrm.hxx
@@ -25,10 +25,10 @@
 #include <tools/stream.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
     class XInputStream;
     class XSeekable;
-} } } }
+}
 
 class SvDataPipe_Impl;
 
diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx
index 987dcdf796e8..f4e736542586 100644
--- a/include/svl/outstrm.hxx
+++ b/include/svl/outstrm.hxx
@@ -24,9 +24,9 @@
 #include <com/sun/star/uno/Reference.h>
 #include <tools/stream.hxx>
 
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
     class XOutputStream;
-} } } }
+}
 
 
 class SVL_DLLPUBLIC SvOutputStream final : public SvStream
diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx
index 7c3eae17b8ce..cd93e6436a67 100644
--- a/include/svl/ownlist.hxx
+++ b/include/svl/ownlist.hxx
@@ -24,13 +24,8 @@
 #include <rtl/ustring.hxx>
 #include <vector>
 
-namespace com { namespace sun { namespace star {
-    namespace beans {
-        struct PropertyValue;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
 
 class SvCommand
 /*
diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx
index 3395f91d5a24..ddd29717a3d1 100644
--- a/include/svl/sharecontrolfile.hxx
+++ b/include/svl/sharecontrolfile.hxx
@@ -25,11 +25,11 @@
 #include <svl/lockfilecommon.hxx>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XSeekable; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XTruncate; } } } }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
+namespace com::sun::star::io { class XSeekable; }
+namespace com::sun::star::io { class XStream; }
+namespace com::sun::star::io { class XTruncate; }
 
 namespace svt {
 
diff --git a/include/svl/sigstruct.hxx b/include/svl/sigstruct.hxx
index f6ee242c84d1..38c1ee5ed142 100644
--- a/include/svl/sigstruct.hxx
+++ b/include/svl/sigstruct.hxx
@@ -29,7 +29,7 @@
 #include <set>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+namespace com::sun::star::graphic { class XGraphic; }
 
 /*
  * type of reference
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index 9215cf82d7c8..48e558149881 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -25,7 +25,7 @@
 #include <svl/poolitem.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 class SVL_DLLPUBLIC SfxStringListItem final : public SfxPoolItem
 {
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 1ba5e63ad4f7..8de6231c1dc5 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -171,11 +171,11 @@ protected:
 };
 
 
-namespace svl { namespace undo { namespace impl
+namespace svl::undo::impl
 {
     class UndoManagerGuard;
     class LockGuard;
-} } }
+}
 
 struct SfxUndoManager_Data;
 class SVL_DLLPUBLIC SfxUndoManager
diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx
index 5d8171e21efa..9f8588c97295 100644
--- a/include/svl/urihelper.hxx
+++ b/include/svl/urihelper.hxx
@@ -26,10 +26,10 @@
 #include <tools/link.hxx>
 #include <tools/urlobj.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { class XComponentContext; }
     namespace uri { class XUriReference; }
-} } }
+}
 
 class CharClass;
 
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 664ddbc25de7..244121d4afe7 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -35,9 +35,9 @@
 #include <memory>
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace i18n { class XNumberFormatCode; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct Currency; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct NumberFormatCode; } } } }
+namespace com::sun::star::i18n { class XNumberFormatCode; }
+namespace com::sun::star::i18n { struct Currency; }
+namespace com::sun::star::i18n { struct NumberFormatCode; }
 
 class Date;
 class Color;
@@ -47,12 +47,7 @@ class CalendarWrapper;
 class ImpSvNumberformatScan;
 class ImpSvNumberInputScan;
 class SvNumberformat;
-
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 #define SV_COUNTRY_LANGUAGE_OFFSET     10000  // Max count of formats per country/language
 #define SV_MAX_COUNT_STANDARD_FORMATS  100    // Max count of builtin default formats per CL
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 6c9f5b062f4c..5b6f70243f96 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -28,7 +28,7 @@ namespace utl {
     class DigitGroupingIterator;
 }
 
-namespace com { namespace sun { namespace star { namespace i18n { struct NativeNumberXmlAttributes2; } } } }
+namespace com::sun::star::i18n { struct NativeNumberXmlAttributes2; }
 
 class Color;
 
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index bf8db2746e10..fda16e3ff780 100644
--- a/include/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
@@ -30,10 +30,10 @@ namespace com :: sun :: star :: uno { template <typename > class Reference; }
 
 class ExtMultiLineEdit;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document { class XDocumentProperties; }
     namespace util { struct DateTime; }
-} } }
+}
 
 namespace svtools {
 
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx
index 2eff2d731dd9..519f47e7b74a 100644
--- a/include/svtools/DocumentToGraphicRenderer.hxx
+++ b/include/svtools/DocumentToGraphicRenderer.hxx
@@ -32,7 +32,7 @@ namespace com :: sun :: star :: frame { class XModel; }
 namespace com :: sun :: star :: lang { class XComponent; }
 namespace com :: sun :: star :: view { class XRenderable; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace drawing {
         class XShapes;
         class XShape;
@@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star {
     namespace frame {
         class XController;
     }
-}}}
+}
 
 class SVT_DLLPUBLIC DocumentToGraphicRenderer
 {
diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index 0078be7936d2..12a8a2367a4b 100644
--- a/include/svtools/embedhlp.hxx
+++ b/include/svtools/embedhlp.hxx
@@ -33,9 +33,9 @@ namespace comphelper
     class EmbeddedObjectContainer;
 }
 
-namespace com { namespace sun { namespace star { namespace embed {
+namespace com::sun::star::embed {
     class XEmbeddedObject;
-}}}}
+}
 
 class OutputDevice;
 
diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index fc9580bc50ba..1565ce3c828c 100644
--- a/include/svtools/openfiledroptargetlistener.hxx
+++ b/include/svtools/openfiledroptargetlistener.hxx
@@ -32,9 +32,9 @@
 
 namespace com :: sun :: star :: frame { class XFrame; }
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
 /** DropTargetListener that takes care of opening a file when it is dropped in the frame.
 */
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 2bd863ddc96a..1c9392d2d0b3 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -28,11 +28,11 @@
 
 namespace com :: sun :: star :: uno { template <class interface_type> class Reference; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document {
         class XDocumentProperties;
     }
-} } }
+}
 
 class Color;
 enum class HtmlOptionId;
diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx
index 6a5bc21a8c6d..ad1f4859d32b 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -17,9 +17,9 @@
 namespace com :: sun :: star :: uno { template <typename > class Reference; }
 
 namespace weld { class Window; }
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
 namespace svtools {
 
diff --git a/include/svtools/textwindowpeer.hxx b/include/svtools/textwindowpeer.hxx
index b67da50980bf..6edc665c6b31 100644
--- a/include/svtools/textwindowpeer.hxx
+++ b/include/svtools/textwindowpeer.hxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <svtools/svtdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     class XWindowPeer;
-} } } }
+}
 class TextView;
 
 namespace svt {
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 75c38657bf9a..a90ab5ee9f27 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -33,7 +33,7 @@
 #include <sal/types.h>
 #include <svx/AccessibleShape.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
     namespace accessibility { class XAccessibleContext; }
     namespace accessibility { struct AccessibleEventObject; }
@@ -47,7 +47,7 @@ namespace com { namespace sun { namespace star {
     namespace lang { class XTypeProvider; }
     namespace uno { class XAggregation; }
     namespace util { struct ModeChangeEvent; }
-} } }
+}
 
 namespace comphelper
 {
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index 07f68228439d..5119da01635b 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -30,9 +30,9 @@
 #include <svx/AccessibleShape.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessibleKeyBinding; }
-} } }
+}
 
 namespace accessibility {
 
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index ced35ca26e66..487c7aeabd80 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -46,7 +46,7 @@
 #include <svx/svxdllapi.h>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
     namespace accessibility { class XAccessibleEventListener; }
     namespace accessibility { class XAccessibleHyperlink; }
@@ -56,7 +56,7 @@ namespace com { namespace sun { namespace star {
     namespace document { struct EventObject; }
     namespace drawing { class XShape; }
     namespace uno { class XInterface; }
-} } }
+}
 
 class SdrObject;
 
diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx
index d40251c41237..5cb9bfb0db04 100644
--- a/include/svx/AccessibleShapeInfo.hxx
+++ b/include/svx/AccessibleShapeInfo.hxx
@@ -23,10 +23,10 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
     namespace drawing { class XShape; }
-} } }
+}
 
 namespace accessibility {
 
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx
index 82f98759902f..220bc2649a2e 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -24,11 +24,11 @@
 #include <svx/svxdllapi.h>
 #include <vcl/window.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessibleComponent; }
     namespace document { class XShapeEventBroadcaster; }
     namespace frame { class XController; }
-} } }
+}
 
 class SdrView;
 
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index e469b8df477c..5f646d83253c 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -27,11 +27,11 @@
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
     namespace accessibility { class XAccessibleEventListener; }
     namespace awt { struct Point; }
-} } }
+}
 
 class Point;
 class SvxEditSource;
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index a9d1842d8057..14a90c7549bf 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -26,11 +26,11 @@
 #include <rtl/ref.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
      namespace accessibility { class XAccessible; }
      namespace drawing { class XShape; }
      namespace drawing { class XShapes; }
-} } }
+}
 
 namespace accessibility {
 
diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index 3fe96af56fd2..9b8b11049539 100644
--- a/include/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
@@ -25,18 +25,17 @@
 #include <com/sun/star/smarttags/XSmartTagAction.hpp>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace container {
+namespace com::sun::star::container {
     class XStringKeyMap;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace text {
+namespace com::sun::star::text {
     class XTextRange;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
     class XController;
-} } } }
-
+}
 class SVX_DLLPUBLIC SvxSmartTagItem final : public SfxPoolItem
 {
     const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > > maActionComponentsSequence;
diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index a614d97ebbd9..b20f68a60002 100644
--- a/include/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
@@ -31,37 +31,37 @@
 #include <map>
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace smarttags {
+namespace com::sun::star::smarttags {
     class XSmartTagRecognizer;
     class XSmartTagAction;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace text {
+namespace com::sun::star::text {
     class XTextMarkup;
     class XTextRange;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace com::sun::star::i18n {
     class XBreakIterator;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     struct Locale;
     struct EventObject;
     struct ChangesEvent;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     class XPropertySet;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
     class XController;
-} } } }
+}
 
 /** A reference to a smart tag action
 
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 6d51b4a60b3b..4b47a785b860 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -35,9 +35,9 @@
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility { class XAccessible; }
-} } }
+}
 
 namespace com::sun::star::uno { class XComponentContext; }
 
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index c1fa1c1f9fd6..e587dbc3db6d 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -24,11 +24,11 @@
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace embed { class XEmbeddedObject; }
     namespace frame { class XModel; }
     namespace uno { template <typename > class Reference; }
-} } }
+}
 
 namespace basegfx { class B2DRange; }
 
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 6fdcce7256ef..d9b660fa6e52 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -27,7 +27,7 @@
 #include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
 
-namespace sdr { namespace contact { class ViewContact; } }
+namespace sdr::contact { class ViewContact; }
 
 class E3dDefaultAttributes;
 
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index b8285349b5e8..d6d299849e95 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -31,9 +31,9 @@
 #include <memory>
 #include <array>
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     struct Point;
-} } } }
+}
 
 /*************************************************************************
 |* Derived from SfxTabPage for being able to get notified through the
diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx
index 6ba0afa888dc..dd7954180cac 100644
--- a/include/svx/e3dsceneupdater.hxx
+++ b/include/svx/e3dsceneupdater.hxx
@@ -26,9 +26,9 @@
 class SdrObject;
 class E3dScene;
 
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
     class ViewInformation3D;
-}}
+}
 
 /** Helper for 3d object changes affecting 2d geometry
 
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index b3005014b757..7459837ec31e 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -27,11 +27,11 @@
 class FmFormModel;
 class FmFormPageImpl;   // contains a list of all forms
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace form {
         class XForms;
     }
-}}}
+}
 
 class SdrView;
 class HelpEvent;
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index ca0a13a902f1..809f26e291c6 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -42,12 +42,12 @@ class SdrView;
 class SdrUnoObj;
 class LinkParamNone;
 
-namespace com { namespace sun { namespace star { namespace form {
+namespace com::sun::star::form {
     class XForm;
     namespace runtime {
         class XFormController;
     }
-} } } }
+}
 
 namespace com::sun::star::awt { class XControl; }
 namespace com::sun::star::awt { class XControlModel; }
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index b83420b43e0c..00cecc94d8be 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -23,14 +23,14 @@
 #include <svx/view3d.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         class XPropertySet;
     }
     namespace util {
         class XNumberFormats;
     }
-}}}
+}
 
 class OutputDevice;
 class FmFormObj;
@@ -44,12 +44,12 @@ namespace svx {
 }
 
 class SdrUnoObj;
-namespace com { namespace sun { namespace star { namespace form {
+namespace com::sun::star::form {
     class XForm;
     namespace runtime {
         class XFormController;
     }
-} } } }
+}
 
 class SVXCORE_DLLPUBLIC FmFormView : public E3dView
 {
diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx
index 0e07e309b9c4..f262564b9e66 100644
--- a/include/svx/helperhittest3d.hxx
+++ b/include/svx/helperhittest3d.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
     class B2DPoint;
 }
 
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
     class ViewInformation3D;
-}}
+}
 
 class E3dCompoundObject;
 class E3dScene;
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 963b14c25075..fbecb2719ba0 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -24,7 +24,7 @@
 #include <editeng/numitem.hxx>
 #include <vcl/font.hxx>
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 #define DEFAULT_BULLET_TYPES                            8
 #define DEFAULT_NUM_VALUSET_COUNT                       8
@@ -204,7 +204,7 @@ class OutlineTypeMgr: public NBOTypeMgrBase
         virtual bool IsCustomized(sal_uInt16 nIndex) override;
         static OutlineTypeMgr& GetInstance();
 };
-}}
+}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/nbdtmgfact.hxx b/include/svx/nbdtmgfact.hxx
index 011cf41ec82f..3928be1e6f36 100644
--- a/include/svx/nbdtmgfact.hxx
+++ b/include/svx/nbdtmgfact.hxx
@@ -21,9 +21,10 @@
 
 #include <svx/nbdtmg.hxx>
 
-namespace svx { namespace sidebar { namespace NBOutlineTypeMgrFact {
+namespace svx::sidebar::NBOutlineTypeMgrFact {
     SVX_DLLPUBLIC NBOTypeMgrBase* CreateInstance(const NBOType aType);
-}}}
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index ed17989fff9e..2b58fb6dd4ab 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <svx/svxdllapi.h>
 
-namespace com{namespace sun{ namespace star{
+namespace com::sun::star {
     namespace container{
         class XIndexAccess;
     }
@@ -36,7 +36,7 @@ namespace com{namespace sun{ namespace star{
     namespace text{
         class XNumberingFormatter;
     }
-}}}
+}
 
 enum class NumberingPageType
 {
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index b4c7abf6d3b7..c986cd68d0ab 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -30,13 +30,13 @@
 // Forward declarations
 class E3dScene;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class BaseProperties;
     class E3dCompoundProperties;
     class E3dExtrudeProperties;
     class E3dLatheProperties;
     class E3dSphereProperties;
-}}
+}
 
 /*************************************************************************
 |*
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index bd53b273a16c..837c2da43a39 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -28,9 +28,9 @@
 #include <svx/svx3ditems.hxx>
 #include <memory>
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class BaseProperties;
-}}
+}
 
 /*************************************************************************
 |*
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index 27c219b2cba4..6d5d63a27b1c 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -35,7 +35,7 @@ namespace basegfx {
     class B2DHomMatrix;
 }
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class DisplayInfo;
 class ViewContact;
@@ -167,7 +167,7 @@ public:
     void resetAllGridOffsets();
 };
 
-}}
+}
 
 
 #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index 288a0007266a..c3e9328d954f 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -28,7 +28,7 @@ class SdrLayerIDSet;
 class SdrPage;
 class SdrObject;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class ObjectContact;
 class ViewObjectContact;
@@ -140,7 +140,7 @@ public:
     void flushViewObjectContacts(bool bWithHierarchy = true);
 };
 
-}}
+}
 
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX
diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
index 890a964b0af7..b26e272f91f3 100644
--- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
@@ -32,7 +32,7 @@ namespace basegfx {
     class B3DRange;
 }
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewContactOfE3dScene final : public ViewContactOfSdrObj
 {
@@ -96,7 +96,7 @@ private:
     drawinglayer::attribute::SdrLightingAttribute       maSdrLightingAttribute;
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX
 
diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 0d7813a71029..cb2953200da4 100644
--- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -27,7 +27,7 @@
 
 namespace avmedia { class MediaItem; }
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj
 {
@@ -67,7 +67,7 @@ protected:
     virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 };
 
-}}
+}
 
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index d8d17d96c3f1..a20dde7bb4b6 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -29,7 +29,7 @@ class SdrObject;
 class GeoStat;
 class Bitmap;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewContactOfSdrObj : public ViewContact
 {
@@ -80,7 +80,7 @@ public:
     virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(drawinglayer::primitive2d::Primitive2DContainer aSource) const override;
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX
 
diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
index 3e514f116ee1..f1374c7fb669 100644
--- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
@@ -24,7 +24,7 @@
 
 class SdrVirtObj;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewContactOfVirtObj : public ViewContactOfSdrObj
 {
@@ -47,7 +47,7 @@ protected:
     virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
 
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index f7542908a8e6..9c806aa08e46 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -26,11 +26,11 @@
 
 namespace vcl { class Region; }
 
-namespace sdr { namespace animation {
+namespace sdr::animation {
     class PrimitiveAnimation;
-}}
+}
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class DisplayInfo;
 class ObjectContact;
@@ -130,7 +130,7 @@ public:
     void resetGridOffset();
 };
 
-}}
+}
 
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index 7f2565576322..07e748651ad3 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
@@ -26,7 +26,7 @@ class SdrObject;
 class SdrLayerIDSet;
 class OutputDevice;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class SVXCORE_DLLPUBLIC ViewObjectContactOfSdrObj : public ViewObjectContact
 {
@@ -58,7 +58,7 @@ public:
     const OutputDevice* getPageViewOutputDevice() const;
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
 
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index c30be2b9ddca..1dc69d2383d1 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -23,7 +23,7 @@
 #include <svx/svxdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
 
 class DisplayInfo;
 class ViewObjectContact;
@@ -48,7 +48,7 @@ public:
         const sdr::contact::DisplayInfo& rDisplayInfo);
 };
 
-}}
+}
 
 #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
 
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index f75f42107520..412d45aa3a5c 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -35,9 +35,9 @@ class OutputDevice;
 class SdrModel;
 namespace vcl { class Region; }
 
-namespace sdr { namespace overlay {
+namespace sdr::overlay {
     class OverlayObject;
-}}
+}
 
 namespace basegfx {
     class B2DRange;
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index f186b32147f6..f34499a05991 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -35,7 +35,7 @@ class SfxItemSet;
 class SvxBoxInfoItem;
 class SvxBoxItem;
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 class TableModel;
 
@@ -191,7 +191,7 @@ rtl::Reference< sdr::SelectionController > CreateTableController(
      const SdrTableObj& rObj,
      const rtl::Reference< sdr::SelectionController >& xRefController );
 
-} }
+}
 
 #endif // INCLUDED_SVX_SDR_TABLE_TABLECONTROLLER_HXX
 
diff --git a/include/svx/sdr/table/tabledesign.hxx b/include/svx/sdr/table/tabledesign.hxx
index cf0ed0cf00f9..8c03ee67b3ea 100644
--- a/include/svx/sdr/table/tabledesign.hxx
+++ b/include/svx/sdr/table/tabledesign.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/container/XNameAccess.hpp>
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 const sal_Int32 first_row_style = 0;
 const sal_Int32 last_row_style = 1;
@@ -40,7 +40,7 @@ const sal_Int32 style_count = 10;
 
 extern SVX_DLLPUBLIC css::uno::Reference< css::container::XNameAccess > CreateTableDesignFamily();
 
-} }
+}
 
 
 #endif
diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx
index 3dc9c81d69f5..87cf1afbea10 100644
--- a/include/svx/sdrhittesthelper.hxx
+++ b/include/svx/sdrhittesthelper.hxx
@@ -31,9 +31,9 @@ class SdrObject;
 class SdrPageView;
 class SdrLayerIDSet;
 class SdrObjList;
-namespace sdr { namespace contact { class ViewObjectContact; }}
+namespace sdr::contact { class ViewObjectContact; }
 namespace basegfx { class B2DPoint; }
-namespace drawinglayer { namespace primitive2d { class Primitive2DContainer; }}
+namespace drawinglayer::primitive2d { class Primitive2DContainer; }
 
 
 // Wrappers for classic Sdr* Mode/View classes
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index e7d534ca1a9c..80417a6729a0 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -28,7 +28,7 @@
 namespace com::sun::star::awt { class XControlContainer; }
 namespace com::sun::star::uno { template <class interface_type> class Reference; }
 namespace rtl { template <class reference_type> class Reference; }
-namespace sdr { namespace overlay { class OverlayManager; } }
+namespace sdr::overlay { class OverlayManager; }
 namespace vcl { class Region; }
 
 namespace sdr
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 07b311763144..2ea0356dbb27 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -45,7 +45,7 @@ class XFillColorItem;
 class XFillHatchItem;
 class XFillBitmapItem;
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 class SVX_DLLPUBLIC AreaPropertyPanelBase
 :   public PanelLayout,
@@ -171,7 +171,7 @@ protected:
     void SelectFillAttrHdl_Impl();
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif // INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
 
diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
index d10c6445705b..29e6b4f841a1 100644
--- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
+++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
@@ -23,7 +23,7 @@
 
 class XFillFloatTransparenceItem;
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 class AreaTransparencyGradientControl;
 class AreaPropertyPanelBase;
@@ -61,7 +61,7 @@ public:
     void Rearrange(XFillFloatTransparenceItem const * pItem);
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif
 
diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx
index f60a0c848f0d..c16924d0cec8 100644
--- a/include/svx/sidebar/LineWidthPopup.hxx
+++ b/include/svx/sidebar/LineWidthPopup.hxx
@@ -27,7 +27,7 @@
 
 class ValueSet;
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 class LinePropertyPanelBase;
 class LineWidthValueSet;
@@ -64,7 +64,7 @@ private:
     DECL_LINK(FocusHdl, weld::Widget&, void);
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif
 
diff --git a/include/svx/sidebar/SelectionAnalyzer.hxx b/include/svx/sidebar/SelectionAnalyzer.hxx
index d1aebbc220c4..a7b8cba99d4c 100644
--- a/include/svx/sidebar/SelectionAnalyzer.hxx
+++ b/include/svx/sidebar/SelectionAnalyzer.hxx
@@ -26,7 +26,7 @@ class SdrMarkList;
 class SdrObject;
 enum class SdrInventor : sal_uInt32;
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 /** Analyze the current selection of Calc or Draw/Impress documents
     and return the associated sidebar context.
@@ -68,7 +68,7 @@ private:
         const sal_uInt16 nType);
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif
 
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index 0a6b8f637b94..4f5c5b818b5f 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -32,7 +32,7 @@
 class SdrMarkView;
 
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 typedef cppu::WeakComponentImplHelper<
     css::view::XSelectionChangeListener
@@ -69,7 +69,7 @@ private:
 };
 
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 
 #endif
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index 466fa3e05688..5dd075a28458 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
 
 /** Specialization of class <ValueSet>.
     This specialization allows is a one-columned ValueSet which allow
@@ -56,7 +56,7 @@ private:
     ::std::vector< ValueSetWithTextItem > maItems;
 };
 
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
 
 #endif
 
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index f20863aecf69..a78dd5cdc637 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -37,9 +37,9 @@ struct PasteOrDropInfos;
 class SdrUndoManager;
 class TextChainCursorManager;
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class Any;
-} } } }
+}
 
 namespace sdr {
     class SelectionController;
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 1cde7792fa1b..14af8569f0e5 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -43,9 +43,9 @@ class SdrModel;
 class SvtSysLocale;
 class LocaleDataWrapper;
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     struct Locale;
-}}}}
+}
 
 /**
  * Create an Outliner with the engine-global default settings on the heap.
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index ed2905971e97..aca1b4f59404 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -37,9 +37,9 @@ class SdrPageView;
 class MouseEvent;
 class HelpEvent;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
     class ObjectContact;
-}}
+}
 
 // Every object must be able to create its handles. They will be fetched on
 // selection, registered at the View and made visible.
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 20af0b898359..01b928b612ed 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -27,9 +27,9 @@
 //   Forward Declarations
 class ImpCaptParams;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class CaptionProperties;
-}}
+}
 
 //   Helper Class SdrCaptObjGeoData
 class SdrCaptObjGeoData final : public SdrTextObjGeoData
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 2767fdd7d9f5..105850fa3f84 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -23,9 +23,9 @@
 #include <svx/svdorect.hxx>
 #include <svx/svxdllapi.h>
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class CircleProperties;
-}}
+}
 
 // Helper class SdrCircObjGeoData
 
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 66deeb072845..2320091ab1a1 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -29,9 +29,9 @@
 class SdrDragMethod;
 class SdrPageView;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class ConnectorProperties;
-}}
+}
 
 
 /// Utility class SdrObjConnection
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 18a0fb47596e..6384d74882fb 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -28,9 +28,9 @@ class SdrOutliner;
 struct ImpMeasureRec;
 struct ImpMeasurePoly;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class MeasureProperties;
-}}
+}
 
 class SdrMeasureObjGeoData final : public SdrTextObjGeoData
 {
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 1815341aa2e9..258a287509a4 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -27,7 +27,7 @@
 
 class Graphic;
 
-namespace sdr { namespace contact { class ViewContactOfSdrMediaObj; } }
+namespace sdr::contact { class ViewContactOfSdrMediaObj; }
 namespace com::sun::star::graphic { class XGraphic; }
 
 
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index c3ce4f0233ec..85f0125c17b0 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -27,7 +27,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 
 namespace awt { class XWindow; }
 
@@ -37,7 +37,7 @@ namespace embed { class XEmbeddedObject; }
 
 namespace frame { class XModel; }
 
-}}}
+}
 
 namespace svt { class EmbeddedObjectRef; }
 
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index 5732a33104d6..98929002b6d2 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -28,9 +28,9 @@
 // Forward declaration
 class XPolygon;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class RectangleProperties;
-}}
+}
 
 
 //   SdrRectObj
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 6333b9d6082f..df713b66c951 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -32,11 +32,11 @@ class SvStream;
 class SfxStyleSheet;
 class SdrUndoAction;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
     class ViewContactOfTableObj;
-}}
+}
 
-namespace sdr { namespace table {
+namespace sdr::table {
 
 class TableLayouter;
 struct ImplTableShadowPaintInfo;
@@ -285,7 +285,7 @@ private:
 SVX_DLLPUBLIC void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj );
 SVX_DLLPUBLIC void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj );
 
-} }
+}
 
 #endif
 
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 3e4782416e47..6f1804bb1757 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -54,32 +54,32 @@ class TextChainFlow;
 enum class EEAnchorMode;
 enum class EETextFormat;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class TextProperties;
-}}
+}
 
-namespace drawinglayer { namespace primitive2d {
+namespace drawinglayer::primitive2d {
     class SdrContourTextPrimitive2D;
     class SdrPathTextPrimitive2D;
     class SdrBlockTextPrimitive2D;
     class SdrAutoFitTextPrimitive2D;
     class SdrStretchTextPrimitive2D;
     class SdrChainedTextPrimitive2D;
-}}
+}
 
-namespace drawinglayer { namespace animation {
+namespace drawinglayer::animation {
     class AnimationEntryList;
-}}
+}
 
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
     class ViewInformation2D;
-}}
+}
 
-namespace sdr { namespace table {
+namespace sdr::table {
     class Cell;
     class SdrTableRtfExporter;
     class SdrTableRTFParser;
-}}
+}
 
 
 //   Defines
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index c78ba0fa2e97..22f10d334a09 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -34,9 +34,9 @@ class SdrView;
 class SdrPageWindow;
 class SdrControlEventListenerImpl;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
     class ViewContactOfUnoControl;
-}}
+}
 
 
 // SdrUnoObj
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index e77713e9c2db..7d55b0fab697 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -37,7 +37,7 @@
 
 // predefines
 namespace reportdesign { class OSection; }
-namespace sdr { namespace contact { class ViewContact; }}
+namespace sdr::contact { class ViewContact; }
 class SdrPage;
 class SdrModel;
 class SfxItemPool;
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 1b96b01ac75f..3f899f529211 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -39,10 +39,10 @@
 // Pre defines
 class SdrPageWindow;
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     class XControlContainer;
-}}}}
-namespace sdr { namespace overlay { class OverlayManager; } }
+}
+namespace sdr::overlay { class OverlayManager; }
 
 class SdrPage;
 class SdrView;
@@ -53,9 +53,9 @@ class SdrModel;
 class SdrObject;
 enum class GraphicManagerDrawFlags;
 
-namespace sdr { namespace contact {
+namespace sdr::contact {
     class ViewObjectContactRedirector;
-}}
+}
 
 
 // Defines for AnimationMode
diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx
index e95120722d79..7f06e3441454 100644
--- a/include/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
@@ -33,9 +33,9 @@ class SdrModel;
 class SfxItemSet;
 enum class OutlinerMode;
 
-namespace sdr { namespace properties {
+namespace sdr::properties {
     class TextProperties;
-}}
+}
 
 /** This class stores information about one text inside a shape.
 */
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 8c5bd6d5e92e..f37cf109811d 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -50,7 +50,7 @@
 //         SdrView         View
 
 class SvxURLField;
-namespace sdr { namespace contact { class ObjectContact; }}
+namespace sdr::contact { class ObjectContact; }
 
 enum class SdrViewContext {
     Standard,
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index e12f1f1ee015..76ef0d3c35cb 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -34,14 +34,13 @@ namespace sd {
     class View;
 }
 
-namespace com{namespace sun{namespace star{
-namespace linguistic2{
+namespace com::sun::star::linguistic2 {
     class XDictionary;
     class XSpellChecker1;
     class XSpellChecker;
     class XThesaurus;
     class XHyphenator;
-}}}}
+}
 class SdrModel;
 class SdrView;
 class SvxSpellWrapper;
diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index e259b5386950..803b2996dda6 100644
--- a/include/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
@@ -24,14 +24,14 @@
 #include <editeng/unoedsrc.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class XInterface;
     }
     namespace accessibility {
         struct TextSegment;
     }
-} } }
+}
 
 class SvxTextForwarder;
 class SdrObject;
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index db5a15c9be21..b9cf5ec6bacc 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -30,7 +30,7 @@
 #include <tools/link.hxx>
 #include <vcl/vclptr.hxx>
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
 
 namespace vcl { class Window; }
 class VCLXWindow;
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index 92ea58480de4..a0f609a9e8b7 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -30,7 +30,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/font.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt { class XDevice; } } } }
+namespace com::sun::star::awt { class XDevice; }
 
 class FontMetric;
 
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 3f64d104bbac..ffa56b0f842d 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -28,7 +28,7 @@
 
 #include <toolkit/awt/vclxcontainer.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt { class XMenuBar; } } } }
+namespace com::sun::star::awt { class XMenuBar; }
 
 typedef ::cppu::ImplHelper2 <   css::awt::XTopWindow2, css::awt::XSystemDependentWindowPeer
                             >   VCLXTopWindow_XBase;
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 2b6095b7c14e..bc93f391f8ce 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -44,7 +44,7 @@
 #include <functional>
 
 namespace comphelper { class OInterfaceContainerHelper2; }
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; } } } }
+namespace com::sun::star::accessibility { class XAccessibleContext; }
 
 class VclWindowEvent;
 
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index 69b5f121a0f6..9f82bb9e4a79 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -40,7 +40,7 @@
 #include <vector>
 #include <map>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 typedef std::map<sal_uInt16, css::uno::Any> ImplPropertyTable;
 
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 6f92de103529..eb75d36b6e97 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -57,8 +57,8 @@
 
 #include <optional>
 
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphicObject; } } } }
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::graphic { class XGraphicObject; }
 
 class ImageHelper
 {
diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx
index 0dad596cb8a7..109e1cbea038 100644
--- a/include/toolkit/helper/accessiblefactory.hxx
+++ b/include/toolkit/helper/accessiblefactory.hxx
@@ -23,10 +23,10 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
-namespace com { namespace sun { namespace star { namespace accessibility {
+namespace com::sun::star::accessibility {
     class XAccessible;
     class XAccessibleContext;
-} } } }
+}
 class VCLXButton;
 class VCLXCheckBox;
 class VCLXRadioButton;
diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx
index a60604d9801b..d1aa35ebfefe 100644
--- a/include/toolkit/helper/formpdfexport.hxx
+++ b/include/toolkit/helper/formpdfexport.hxx
@@ -26,8 +26,8 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace awt { class XControl; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::awt { class XControl; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
 namespace vcl
 {
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index b0804b3d4657..6bdffe9f1fec 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -34,13 +34,13 @@
 #include <tools/poly.hxx>
 
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::uno { template <typename > class Sequence; }
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XInterface;
-}}}}
+}
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     class XBitmap;
     class XWindow;
     class XWindow2;
@@ -57,7 +57,7 @@ namespace com { namespace sun { namespace star { namespace awt {
     struct FontDescriptor;
     struct Rectangle;
     struct KeyEvent;
-}}}}
+}
 
 
 class FontMetric;
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index f66d49b51442..afdb30d9e02c 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -254,13 +254,13 @@ inline void operator <<=( css::uno::Any & rAny, Color value )
 {
     rAny <<= sal_Int32(value);
 }
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     template<>
     inline Any makeAny( Color const & value )
     {
         return Any(sal_Int32(value));
     }
-} } } }
+}
 
 // Test compile time conversion of Color to sal_uInt32
 
diff --git a/include/tools/date.hxx b/include/tools/date.hxx
index 0adbc2ea4b4f..cd69d16b10b6 100644
--- a/include/tools/date.hxx
+++ b/include/tools/date.hxx
@@ -25,7 +25,7 @@
 
 #include <com/sun/star/util/Date.hpp>
 
-namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } }
+namespace com::sun::star::util { struct DateTime; }
 
 enum DayOfWeek { MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY,
                  SATURDAY, SUNDAY };
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 7365d60728a4..e069717bbd53 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -56,7 +56,7 @@ protected:
     long                nB;
 };
 
-namespace tools { namespace detail {
+namespace tools::detail {
 
 // Used to implement operator == for subclasses of Pair:
 inline bool equal(Pair const & p1, Pair const & p2)
@@ -64,7 +64,7 @@ inline bool equal(Pair const & p1, Pair const & p2)
     return p1.A() == p2.A() && p1.B() == p2.B();
 }
 
-} }
+}
 
 // Point
 
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index 6fea12fea984..ec88bf953352 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -154,7 +154,7 @@ private:
 // Class used to indicate that the Call() parameter is not in use:
 class LinkParamNone { LinkParamNone() = delete; };
 
-namespace tools { namespace detail {
+namespace tools::detail {
 
 // Avoids loplugin:redundantcast in LINK macro, in the common case that Instance
 // is already of type Class * (instead of a derived type):
@@ -173,7 +173,7 @@ Link<Arg, Ret> makeLink(void * instance, Ret (* function)(void *, Arg)) {
 }
 #endif
 
-} }
+}
 
 #endif
 
diff --git a/include/tools/time.hxx b/include/tools/time.hxx
index bada8bd5a2d0..414b28f72986 100644
--- a/include/tools/time.hxx
+++ b/include/tools/time.hxx
@@ -22,7 +22,7 @@
 #include <tools/toolsdllapi.h>
 #include <com/sun/star/util/Time.hpp>
 
-namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } }
+namespace com::sun::star::util { struct DateTime; }
 
 /**
  @WARNING: This class can serve both as wall clock time and time duration, and
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index d8b812bb7a81..1fb5f4e86aea 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -30,11 +30,11 @@
 
 class SvMemoryStream;
 
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
     class XStringWidth;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 // Common URL prefixes for various schemes:
 #define INET_FTP_SCHEME "ftp://"
diff --git a/include/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx
index fcc1011502b6..85eba5d987d4 100644
--- a/include/ucbhelper/cancelcommandexecution.hxx
+++ b/include/ucbhelper/cancelcommandexecution.hxx
@@ -24,11 +24,11 @@
 #include <com/sun/star/ucb/IOErrorCode.hpp>
 #include <ucbhelper/ucbhelperdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { class Any; }
     namespace ucb { class XCommandEnvironment; }
     namespace ucb { class XCommandProcessor; }
-} } }
+}
 
 namespace ucbhelper
 {
diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index da312323033f..f382373f98b4 100644
--- a/include/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.hxx
@@ -24,23 +24,23 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <ucbhelper/ucbhelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     class XPropertySetInfo;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
     class XActiveDataSink;
     class XOutputStream;
     class XInputStream;
     class XStream;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace sdbc {
+namespace com::sun::star::sdbc {
     class XResultSet;
     class XRow;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     class XCommandEnvironment;
     class XCommandInfo;
     class XContent;
@@ -48,13 +48,13 @@ namespace com { namespace sun { namespace star { namespace ucb {
     class XAnyCompareFactory;
     struct ContentInfo;
     struct NumberedSortingInfo;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com::sun::star::uno { class Any; }
 
 namespace ucbhelper
 {
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 76a2e290b497..afa1328cc493 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -36,19 +36,19 @@
 #include <ucbhelper/ucbhelperdllapi.h>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     struct CommandInfo;
     class XCommandEnvironment;
     class XCommandInfo;
     class XPersistentPropertySet;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct Property;
     class XPropertySetInfo;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace ucbhelper_impl { struct ContentImplHelper_Impl; }
 
diff --git a/include/ucbhelper/getcomponentcontext.hxx b/include/ucbhelper/getcomponentcontext.hxx
index a37ea97d2c65..8c2a14a88845 100644
--- a/include/ucbhelper/getcomponentcontext.hxx
+++ b/include/ucbhelper/getcomponentcontext.hxx
@@ -25,10 +25,10 @@
 #include <com/sun/star/uno/Reference.h>
 #include <ucbhelper/ucbhelperdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang { class XMultiServiceFactory; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace ucbhelper {
 
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index ed3cd4671d12..2d23d2d5fe16 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -30,15 +30,15 @@
 #include <ucbhelper/ucbhelperdllapi.h>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace script {
+namespace com::sun::star::script {
     class XTypeConverter;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     class XPropertySet;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 enum class PropsSet;
 namespace ucbhelper_impl { struct PropertyValue; }
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 919a0909028f..188235d9a996 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -31,12 +31,12 @@
 #include <ucbhelper/ucbhelperdllapi.h>
 
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     class XPropertySetRegistry;
     class XPersistentPropertySet;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace ucbhelper_impl { struct ContentProviderImplHelper_Impl; }
 
diff --git a/include/ucbhelper/proxydecider.hxx b/include/ucbhelper/proxydecider.hxx
index 511f04166386..9a1abad3264a 100644
--- a/include/ucbhelper/proxydecider.hxx
+++ b/include/ucbhelper/proxydecider.hxx
@@ -24,8 +24,8 @@
 #include <rtl/ref.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
 namespace ucbhelper
 {
diff --git a/include/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx
index c05d3729b9cc..7ca407371a5e 100644
--- a/include/ucbhelper/registerucb.hxx
+++ b/include/ucbhelper/registerucb.hxx
@@ -25,12 +25,11 @@
 
 #include <ucbhelper/ucbhelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
-
-namespace com { namespace sun { namespace star {
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star {
     namespace uno { class XComponentContext; }
     namespace ucb { class XContentProviderManager; }
-} } }
+}
 
 
 namespace ucbhelper {
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 12c83ff8e6d1..9bca51b8aa9a 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -36,8 +36,8 @@
 #include <ucbhelper/ucbhelperdllapi.h>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace ucb { class XCommandEnvironment; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::ucb { class XCommandEnvironment; }
 
 namespace ucbhelper {
 
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index eed2ef6355ac..6163a148c0db 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -29,7 +29,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace cppu {
     class OInterfaceContainerHelper;
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 7fecfafedb76..8f8e28c1cd1c 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -29,10 +29,10 @@
 #include <cppuhelper/implbase.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct Property; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace ucbhelper_impl {
     struct ResultSetMetaData_Impl;
diff --git a/include/ucbhelper/simpleauthenticationrequest.hxx b/include/ucbhelper/simpleauthenticationrequest.hxx
index bcde380d284a..69cb20ab85fd 100644
--- a/include/ucbhelper/simpleauthenticationrequest.hxx
+++ b/include/ucbhelper/simpleauthenticationrequest.hxx
@@ -24,9 +24,9 @@
 #include <ucbhelper/interactionrequest.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
   class URLAuthenticationRequest;
-} } } }
+}
 
 namespace ucbhelper {
 
diff --git a/include/ucbhelper/simplecertificatevalidationrequest.hxx b/include/ucbhelper/simplecertificatevalidationrequest.hxx
index 8ed4733c3dc1..f839e0253f2a 100644
--- a/include/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/include/ucbhelper/simplecertificatevalidationrequest.hxx
@@ -23,8 +23,8 @@
 #include <ucbhelper/interactionrequest.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace security { class XCertificate; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::security { class XCertificate; }
 
 
 namespace ucbhelper {
diff --git a/include/unotest/officeconnection.hxx b/include/unotest/officeconnection.hxx
index fbf85b6931d1..553f24b3cc4c 100644
--- a/include/unotest/officeconnection.hxx
+++ b/include/unotest/officeconnection.hxx
@@ -26,9 +26,9 @@
 #include <osl/process.h>
 #include <unotest/detail/unotestdllapi.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
 namespace test {
 
diff --git a/include/unotools/ZipPackageHelper.hxx b/include/unotools/ZipPackageHelper.hxx
index 34e256176683..f647fed4083a 100644
--- a/include/unotools/ZipPackageHelper.hxx
+++ b/include/unotools/ZipPackageHelper.hxx
@@ -24,9 +24,9 @@
 
 #include <com/sun/star/uno/XInterface.hpp>
 
-namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XSingleServiceFactory; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::container { class XHierarchicalNameAccess; }
+namespace com::sun::star::lang { class XSingleServiceFactory; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace utl {
 
diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx
index a81186ae4ba5..aa0bb345c95b 100644
--- a/include/unotools/calendarwrapper.hxx
+++ b/include/unotools/calendarwrapper.hxx
@@ -26,19 +26,9 @@
 #include <com/sun/star/i18n/Calendar2.hpp>
 #include <unotools/unotoolsdllapi.h>
 
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
-
-namespace com { namespace sun { namespace star {
-    namespace i18n {
-        class XCalendar4;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::i18n { class XCalendar4; }
+namespace com::sun::star::lang { struct Locale; }
 
 class UNOTOOLS_DLLPUBLIC CalendarWrapper
 {
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index a916f93eb92b..61a850da9570 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -29,13 +29,8 @@
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace i18n { class XCharacterClassification; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::i18n { class XCharacterClassification; }
 
 const sal_Int32 nCharClassAlphaType =
     css::i18n::KCharacterType::UPPER |
diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx
index b8f6ad00d699..bcc56766fb1d 100644
--- a/include/unotools/closeveto.hxx
+++ b/include/unotools/closeveto.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { class XInterface; }
 
 namespace utl
 {
diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index b28c20638fc7..25bae43604fc 100644
--- a/include/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.hxx
@@ -25,9 +25,9 @@
 #include <unotools/options.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 namespace osl { class Mutex; }
 
 /*-************************************************************************************************************
diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx
index 12be0f6e94d2..595d9ccf4f41 100644
--- a/include/unotools/collatorwrapper.hxx
+++ b/include/unotools/collatorwrapper.hxx
@@ -24,12 +24,12 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
         class XComponentContext;
-}}}}
+}
 
-namespace com { namespace sun { namespace star { namespace i18n { class XCollator; } } } }
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::i18n { class XCollator; }
+namespace com::sun::star::lang { struct Locale; }
 
 class UNOTOOLS_DLLPUBLIC CollatorWrapper
 {
diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index 24f2da53e590..feae53faec8c 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
 namespace osl { class Mutex; }
 
 /*-************************************************************************************************************
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 0c24857aef7b..e14aaf0f2418 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -28,7 +28,7 @@
 #include <unotools/options.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace com{ namespace sun{ namespace star{
+namespace com::sun::star {
     namespace uno{
         class Any;
     }
@@ -41,7 +41,7 @@ namespace com{ namespace sun{ namespace star{
     namespace util{
         class XChangesListener;
     }
-}}}
+}
 
 enum class ConfigItemMode
 {
diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index e79629834db4..a4d46cb8e19e 100644
--- a/include/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
@@ -28,9 +28,9 @@
 #include <sal/types.h>
 #include <unotools/unotoolsdllapi.h>
 
-namespace com { namespace sun { namespace star {
-    namespace container{ class XHierarchicalNameAccess; }
-} } }
+namespace com::sun::star::container {
+    class XHierarchicalNameAccess;
+}
 namespace utl { class ConfigItem; }
 
 namespace utl {
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 9e3d57ee8b9a..ae967660e4cb 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -22,13 +22,13 @@
 #include <unotools/unotoolsdllapi.h>
 #include <unotools/eventlisteneradapter.hxx>
 
-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 container { class XNameContainer; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XNameReplace; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XChangesBatch; } } } }
+namespace com::sun::star::container { class XHierarchicalNameAccess; }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::container { class XNameContainer; }
+namespace com::sun::star::container { class XNameReplace; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XChangesBatch; }
 
 namespace utl
 {
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index 708f6acc9292..c4447fca28f4 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -25,8 +25,8 @@
 #include <memory>
 
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::uno { class XComponentContext; }
 namespace osl { class Mutex; }
 
 namespace utl
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index c83da27040aa..0871edb31162 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -25,9 +25,9 @@
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace util { struct Date; } } } }
-namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } }
-namespace com { namespace sun { namespace star { namespace util { struct Time; } } } }
+namespace com::sun::star::util { struct Date; }
+namespace com::sun::star::util { struct DateTime; }
+namespace com::sun::star::util { struct Time; }
 
 class Date;
 class DateTime;
diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index b9a1bac2911c..a2bb84e0acd8 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -25,7 +25,7 @@
 #include <unotools/options.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
 namespace osl { class Mutex; }
 
 /*-************************************************************************************************************
diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index b3eeb4d5a052..92fbe212c586 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/lang/EventObject.hpp>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::lang { class XComponent; }
 
 namespace utl
 {
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index ae7e5c0cfb7e..bf457e02ba13 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -30,8 +30,8 @@
 #include <unordered_set>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class LanguageTag;
 
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index fd852dde0d24..43c61b66788f 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -29,7 +29,7 @@
 
 #include <optional>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
 
 // The method GetList() returns a list of property values.
 // Use follow defines to separate values by names.
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 8a893eb78aad..49d1f8bf5438 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -26,7 +26,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 class CollatorWrapper;
 class LocaleDataWrapper;
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 82d2dfe5d0b3..b586b688fd95 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -28,8 +28,8 @@
 #include <i18nlangtag/lang.h>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XChangesBatch; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::util { class XChangesBatch; }
 
 class SvtLinguConfigItem;
 
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index 7c790e0ee8b0..7f393d9343f3 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -35,17 +35,12 @@
 #include <memory>
 #include <map>
 
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace i18n { class XLocaleData5; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct Calendar2; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct Currency2; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct FormatElement; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct CalendarItem2; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::i18n { class XLocaleData5; }
+namespace com::sun::star::i18n { struct Calendar2; }
+namespace com::sun::star::i18n { struct Currency2; }
+namespace com::sun::star::i18n { struct FormatElement; }
+namespace com::sun::star::i18n { struct CalendarItem2; }
 
 class Date;
 namespace tools { class Time; }
diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx
index da94f4188b3c..bba9ea9a9ab4 100644
--- a/include/unotools/mediadescriptor.hxx
+++ b/include/unotools/mediadescriptor.hxx
@@ -29,9 +29,9 @@
 #include <rtl/ustring.hxx>
 #include <unotools/unotoolsdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
     class XInputStream;
-} } } }
+}
 namespace comphelper { class IDocPasswordVerifier; }
 
 namespace utl {
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index 9e73cba91ef0..969fac8ad598 100644
--- a/include/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
@@ -28,8 +28,8 @@
 #include <memory>
 
 namespace osl { class Mutex; }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::beans { struct PropertyValue; }
 
 /*-************************************************************************************************************
     @short          forward declaration to our private date container implementation
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index 88eb22f30c60..9f632f1f69fe 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -25,13 +25,8 @@
 #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace i18n { class XNativeNumberSupplier2; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::i18n { class XNativeNumberSupplier2; }
 
 class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) NativeNumberWrapper
 {
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index 81e2a253c6de..169e899ca75b 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -25,11 +25,11 @@
 #include <rtl/ref.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang {
         class XComponent;
     }
-} } }
+}
 
 namespace utl
 {
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 68af444d8023..04a25a1a3c46 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -29,8 +29,8 @@
 
 class CharClass;
 
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XTextSearch2; } } } }
+namespace com::sun::star::lang { struct Locale; }
+namespace com::sun::star::util { class XTextSearch2; }
 
 namespace com {
     namespace sun {
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index a87cf29ca32c..138c1e8d1d0c 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -26,14 +26,9 @@
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class XExtendedTransliteration; } } } }
-
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
+namespace com::sun::star::uno { template <typename > class Sequence; }
+namespace com::sun::star::i18n { class XExtendedTransliteration; }
+namespace com::sun::star::uno { class XComponentContext; }
 enum class TransliterationFlags;
 
 namespace utl
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index 82f5ed5d4db1..b00248011ed9 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class Any;
         class XComponentContext;
@@ -34,10 +34,10 @@ namespace com { namespace sun { namespace star {
     namespace ucb{
         class XCommandEnvironment;
     }
-} } }
+}
 namespace ucbhelper { class Content; }
 
-namespace utl { namespace UCBContentHelper {
+namespace utl::UCBContentHelper {
 
 UNOTOOLS_DLLPUBLIC bool IsDocument(OUString const & url);
 
@@ -106,7 +106,7 @@ UNOTOOLS_DLLPUBLIC bool EqualURLs(
 UNOTOOLS_DLLPUBLIC
     css::uno::Reference< css::ucb::XCommandEnvironment > getDefaultCommandEnvironment();
 
-} }
+}
 
 #endif
 
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 8eb088077b54..c4e6a38e5e79 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -25,7 +25,7 @@
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
 namespace osl { class Mutex; }
 
 class SvtViewOptionsBase_Impl;
diff --git a/include/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx
index be2f6765e951..24bac8204d7e 100644
--- a/include/vbahelper/vbaapplicationbase.hxx
+++ b/include/vbahelper/vbaapplicationbase.hxx
@@ -33,10 +33,10 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 typedef InheritedHelperInterfaceWeakImpl< ov::XApplicationBase > ApplicationBase_BASE;
 
diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx
index 73058d0f4b7c..e2441457643f 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -46,14 +46,14 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XEnumerationAccess; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XHelperInterface;
-} }
+}
 
 typedef ::cppu::WeakImplHelper< css::container::XEnumeration > EnumerationHelper_BASE;
 
diff --git a/include/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx
index 4c7a2636917a..3125e5da2d59 100644
--- a/include/vbahelper/vbadialogbase.hxx
+++ b/include/vbahelper/vbadialogbase.hxx
@@ -30,15 +30,15 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XDialogBase;
     class XHelperInterface;
-} }
+}
 
 typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase > VbaDialogBase_BASE;
 
diff --git a/include/vbahelper/vbadialogsbase.hxx b/include/vbahelper/vbadialogsbase.hxx
index 6e695152a47f..9b04b40cf906 100644
--- a/include/vbahelper/vbadialogsbase.hxx
+++ b/include/vbahelper/vbadialogsbase.hxx
@@ -30,15 +30,15 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XDialogsBase;
     class XHelperInterface;
-} }
+}
 
 typedef InheritedHelperInterfaceWeakImpl< ov::XDialogsBase > VbaDialogsBase_BASE;
 
diff --git a/include/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx
index 7ea44b5e0814..60a0bbed9158 100644
--- a/include/vbahelper/vbadocumentbase.hxx
+++ b/include/vbahelper/vbadocumentbase.hxx
@@ -33,15 +33,15 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XDocumentBase;
     class XHelperInterface;
-} }
+}
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::XDocumentBase > VbaDocumentBase_BASE;
 
diff --git a/include/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx
index ac6d316a0256..3f8acd3e70bd 100644
--- a/include/vbahelper/vbadocumentsbase.hxx
+++ b/include/vbahelper/vbadocumentsbase.hxx
@@ -33,16 +33,16 @@
 #include <vbahelper/vbadllapi.h>
 #include <vbahelper/vbahelper.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
     namespace container { class XEnumeration; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XDocumentsBase;
     class XHelperInterface;
-} }
+}
 
 typedef CollTestImplHelper< ooo::vba::XDocumentsBase > VbaDocumentsBase_BASE;
 
diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx
index 91c8bf72c7c5..0126db442ee8 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -38,13 +38,13 @@
 #include <sal/types.h>
 #include <vbahelper/vbadllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document { struct EventObject; }
     namespace frame { class XModel; }
-    namespace script { namespace vba { class XVBAModuleInfo; } }
+    namespace script::vba { class XVBAModuleInfo; }
     namespace uno { class XComponentContext; }
     namespace util { struct ChangesEvent; }
-} } }
+}
 
 class SfxObjectShell;
 
diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx
index 32c8270e1783..732a67bc1d1e 100644
--- a/include/vbahelper/vbafontbase.hxx
+++ b/include/vbahelper/vbafontbase.hxx
@@ -30,15 +30,15 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XPropertySet; }
     namespace container { class XIndexAccess; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XHelperInterface;
-} }
+}
 
 typedef  InheritedHelperInterfaceWeakImpl< ov::XFontBase > VbaFontBase_BASE;
 
diff --git a/include/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx
index 517784d64773..6cd5edb726ed 100644
--- a/include/vbahelper/vbaglobalbase.hxx
+++ b/include/vbahelper/vbaglobalbase.hxx
@@ -33,15 +33,15 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
     namespace uno { class XComponentContext; }
     namespace uno { class XInterface; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XHelperInterface;
-} }
+}
 
 typedef InheritedHelperInterfaceWeakImpl< ov::XGlobalsBase > Globals_BASE;
 class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index f56b34730c08..6f05013cbdfc 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -32,7 +32,7 @@
 #include <vcl/ptrstyle.hxx>
 #include <vcl/errcode.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { class XControl; }
     namespace awt { class XDevice; }
     namespace awt { class XUnitConversion; }
@@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star {
     namespace script { class XTypeConverter; }
     namespace uno { class Exception; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 class SfxObjectShell;
 class SfxViewFrame;
diff --git a/include/vbahelper/vbapagesetupbase.hxx b/include/vbahelper/vbapagesetupbase.hxx
index 527c625c4739..c1b4668364d8 100644
--- a/include/vbahelper/vbapagesetupbase.hxx
+++ b/include/vbahelper/vbapagesetupbase.hxx
@@ -29,15 +29,15 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XPropertySet; }
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XHelperInterface;
-} }
+}
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::XPageSetupBase > VbaPageSetupBase_BASE;
 
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 8c723f3d2cd5..d6a79968bbfb 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -37,21 +37,21 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XPropertySet; }
     namespace drawing { class XShape; }
     namespace drawing { class XShapes; }
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class ShapeHelper;
     class XHelperInterface;
     namespace msforms { class XFillFormat; }
     namespace msforms { class XLineFormat; }
     namespace msforms { class XPictureFormat; }
-} }
+}
 
 typedef  ::cppu::WeakImplHelper< ov::msforms::XShape, css::lang::XEventListener > ListeningShape;
 
diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx
index 2560dbe99f5f..54a052cac0dd 100644
--- a/include/vbahelper/vbashaperange.hxx
+++ b/include/vbahelper/vbashaperange.hxx
@@ -33,21 +33,21 @@
 #include <vbahelper/vbadllapi.h>
 #include <vbahelper/vbahelper.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XEnumeration; }
     namespace container { class XIndexAccess; }
     namespace drawing { class XDrawPage; }
     namespace drawing { class XShapes; }
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XHelperInterface;
     namespace msforms { class XFillFormat; }
     namespace msforms { class XLineFormat; }
     namespace msforms { class XShape; }
-} }
+}
 
 typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE;
 
diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx
index ad4dc93fbf20..cc8cdcdf16fb 100644
--- a/include/vbahelper/vbashapes.hxx
+++ b/include/vbahelper/vbashapes.hxx
@@ -34,7 +34,7 @@
 #include <vbahelper/vbadllapi.h>
 #include <vbahelper/vbahelper.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XEnumeration; }
     namespace container { class XIndexAccess; }
     namespace drawing { class XDrawPage; }
@@ -42,12 +42,12 @@ namespace com { namespace sun { namespace star {
     namespace drawing { class XShapes; }
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XHelperInterface;
     namespace msforms { class XShapeRange; }
-} }
+}
 
 typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE;
 
diff --git a/include/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx
index 22f07bd3e9e3..a93c511a8a39 100644
--- a/include/vbahelper/vbatextframe.hxx
+++ b/include/vbahelper/vbatextframe.hxx
@@ -32,15 +32,15 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XPropertySet; }
     namespace drawing { class XShape; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XHelperInterface;
-} }
+}
 
 typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XTextFrame > VbaTextFrame_BASE;
 
diff --git a/include/vbahelper/vbawindowbase.hxx b/include/vbahelper/vbawindowbase.hxx
index 9b0c31e65e21..bf2c6460ca23 100644
--- a/include/vbahelper/vbawindowbase.hxx
+++ b/include/vbahelper/vbawindowbase.hxx
@@ -34,17 +34,17 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { class XWindow2; }
     namespace awt { class XWindow; }
     namespace frame { class XController; }
     namespace frame { class XModel; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace ooo { namespace vba {
+namespace ooo::vba {
     class XHelperInterface;
-} }
+}
 
 typedef InheritedHelperInterfaceWeakImpl< ov::XWindowBase > WindowBaseImpl_BASE;
 
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index b579b8a982a6..83cf5ad85844 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -23,10 +23,9 @@
 
 class SvStream;
 namespace basegfx { class B2DHomMatrix; }
-namespace com { namespace sun { namespace star { namespace geometry { struct IntegerRectangle2D; } } } }
+namespace com::sun::star::geometry { struct IntegerRectangle2D; }
 
-namespace vcl {
-namespace bitmap {
+namespace vcl::bitmap {
 
 typedef sal_uInt8 (*lookup_table)[256];
 
@@ -130,7 +129,7 @@ bool VCL_DLLPUBLIC isHistorical8x8(const BitmapEx& rBitmapEx, Color& o_rBack, Co
 
 VCL_DLLPUBLIC bool convertBitmap32To24Plus8(BitmapEx const & rInput, BitmapEx & rResult);
 
-}} // end vcl::bitmap
+} // end vcl::bitmap
 
 #endif // INCLUDED_VCL_BITMAP_TOOLS_HXX
 
diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx
index 48651b2a0b34..ae9e0f33c8c1 100644
--- a/include/vcl/FilterConfigItem.hxx
+++ b/include/vcl/FilterConfigItem.hxx
@@ -28,10 +28,10 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::task { class XStatusIndicator; }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { class XInterface; }
 
 class VCL_DLLPUBLIC FilterConfigItem
 {
diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index bd5bcd71f1c3..5a4053fa6569 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -25,7 +25,7 @@
 #include <vcl/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+namespace com::sun::star::graphic { class XGraphic; }
 
 // Adjustment defines
 enum class GraphicAdjustmentFlags
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 65e3287dd5d0..841935aea930 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 
 namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::datatransfer { namespace clipboard { class XClipboard; } }
+namespace com::sun::star::datatransfer::clipboard { class XClipboard; }
 namespace com::sun::star::uno { template <class interface_type> class Reference; }
 namespace com::sun::star::uno { template <typename > class Sequence; }
 namespace vcl { class Window; }
diff --git a/include/vcl/ImageTree.hxx b/include/vcl/ImageTree.hxx
index 1834bad71646..85f05d774cd5 100644
--- a/include/vcl/ImageTree.hxx
+++ b/include/vcl/ImageTree.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
 enum class ImageLoadFlags : sal_uInt16
 {
@@ -39,9 +39,9 @@ namespace o3tl {
 template<> struct typed_flags<ImageLoadFlags>: is_typed_flags<ImageLoadFlags, 0x3> {};
 }
 
-namespace com { namespace sun { namespace star { namespace container {
+namespace com::sun::star::container {
     class XNameAccess;
-}}}}
+}
 
 class ImplImageTree;
 class BitmapEx;
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 459abf4d39a7..1c8d4f968b53 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -28,9 +28,9 @@
 #include <functional>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
 
 class Dialog;
 class BitmapEx;
diff --git a/include/vcl/accessiblefactory.hxx b/include/vcl/accessiblefactory.hxx
index a191b0193705..5769fc8187c1 100644
--- a/include/vcl/accessiblefactory.hxx
+++ b/include/vcl/accessiblefactory.hxx
@@ -27,7 +27,7 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <tools/gen.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace accessibility {
         class XAccessible;
         class XAccessibleContext;
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
     namespace awt {
         class XWindow;
     }
-} } }
+}
 
 namespace vcl { class IAccessibleBrowseBox; }
 namespace vcl { class IAccessibleTabListBox; }
diff --git a/include/vcl/accessibletable.hxx b/include/vcl/accessibletable.hxx
index 738832a3adcb..88b1890f2805 100644
--- a/include/vcl/accessibletable.hxx
+++ b/include/vcl/accessibletable.hxx
@@ -24,11 +24,11 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
 namespace utl { class AccessibleStateSetHelper; }
 namespace vcl { class Window; }
 
-namespace vcl { namespace table
+namespace vcl::table
 {
 
 typedef sal_Int32   RowPos;
@@ -167,8 +167,7 @@ protected:
     ~IAccessibleTableControl() {}
 };
 
-} // namespace table
-} // namespace vcl
+} // namespace vcl::table
 
 #endif // INCLUDED_VCL_ACCESSIBLETABLE_HXX
 
diff --git a/include/vcl/accessibletableprovider.hxx b/include/vcl/accessibletableprovider.hxx
index 03aba6d3ef6c..ff24c98b04b0 100644
--- a/include/vcl/accessibletableprovider.hxx
+++ b/include/vcl/accessibletableprovider.hxx
@@ -23,7 +23,7 @@
 #include <vcl/AccessibleBrowseBoxObjType.hxx>
 #include <vcl/outdev.hxx>
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
 namespace utl { class AccessibleStateSetHelper; }
 
 namespace vcl
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index f8dc7de56520..4dac473bb2f5 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -27,10 +27,10 @@
 
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace rendering {
+namespace com::sun::star::rendering {
     class XBitmapCanvas;
-} } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+}
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 namespace basegfx { class BColorModifierStack; }
 
 enum class TransparentType
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index bfaf13c3bbea..b2bc2488bd03 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -47,7 +47,7 @@ class VclExpander;
 class VclMultiLineEdit;
 struct NotebookBarAddonsItem;
 namespace xmlreader { class XmlReader; }
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 
 struct ComboBoxTextItem
 {
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index e5a5b7de51f5..14c936f0ddee 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -28,7 +28,7 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace frame { struct FeatureStateEvent; } } } }
+namespace com::sun::star::frame { struct FeatureStateEvent; }
 template <class T> class VclPtr;
 
 class Color;
diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx
index 94be4627596c..80a15cffdede 100644
--- a/include/vcl/canvastools.hxx
+++ b/include/vcl/canvastools.hxx
@@ -42,21 +42,21 @@ namespace basegfx
     class B2IRange;
 }
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
 {
     struct RealSize2D;
     struct IntegerPoint2D;
     struct IntegerSize2D;
     struct IntegerRectangle2D;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     class  XBitmap;
     class  XIntegerReadOnlyBitmap;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace rendering { class XColorSpace; } } } }
+namespace com::sun::star::rendering { class XColorSpace; }
 
 namespace vcl
 {
diff --git a/include/vcl/commandinfoprovider.hxx b/include/vcl/commandinfoprovider.hxx
index da79c18b7ced..016e53f79b3d 100644
--- a/include/vcl/commandinfoprovider.hxx
+++ b/include/vcl/commandinfoprovider.hxx
@@ -23,13 +23,10 @@
 #include <vcl/image.hxx>
 #include <vcl/keycod.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::beans { struct PropertyValue; }
 
-namespace com { namespace sun { namespace star {
-    namespace beans { struct PropertyValue; }
-} } }
-
-namespace vcl { namespace CommandInfoProvider {
+namespace vcl::CommandInfoProvider {
 
     /** Return a label for the given command.
         @param rsCommandName
@@ -103,7 +100,7 @@ namespace vcl { namespace CommandInfoProvider {
         const OUString& rModuleName);
 
     VCL_DLLPUBLIC OUString GetModuleIdentifier(const css::uno::Reference<css::frame::XFrame>& rxFrame);
-} }
+}
 
 #endif // INCLUDED_VCL_COMMANDINFOPROVIDER_HXX
 
diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx
index 6219bec9bb1c..19ec9b1e1076 100644
--- a/include/vcl/embeddedfontshelper.hxx
+++ b/include/vcl/embeddedfontshelper.hxx
@@ -16,8 +16,8 @@
 #include <tools/fontenum.hxx>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 /**
  Helper functions for handling embedded fonts in documents.
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 6546854db005..d9b76c56680d 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -29,7 +29,7 @@
 #include <vcl/spinfld.hxx>
 #include <tools/fldunit.hxx>
 
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
 
 class CalendarWrapper;
 class LocaleDataWrapper;
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 17fdd6336e2d..f6a47e43b8ec 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -40,7 +40,7 @@ enum class GraphicType
     Default
 };
 
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic;} } } }
+namespace com::sun::star::graphic { class XGraphic; }
 namespace vcl { class Font; }
 
 class Bitmap;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 040196d70602..7ce85fd8773a 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -28,8 +28,8 @@
 
 #include <memory>
 
-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; }
 
 class INetURLObject;
 
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index a4360d93ac93..bea9e2a39268 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -49,11 +49,8 @@ class MenuBarWindow;
 struct SystemMenuData;
 enum class FloatWinPopupFlags;
 
-namespace com { namespace sun { namespace star { namespace accessibility {
-    class XAccessible;
-}}}}
-
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::accessibility { class XAccessible;  }
+namespace com::sun::star::frame { class XFrame; }
 
 namespace vcl
 {
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index 2404d7c97ca5..9d144c24fd90 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -24,7 +24,7 @@
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
 
-namespace com { namespace sun { namespace star { namespace i18n { class XCharacterClassification; } } } }
+namespace com::sun::star::i18n { class XCharacterClassification; }
 
 // Mnemonic Chars, which we want support
 // Latin 0-9
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index 457a64b9a206..bfa75d68039f 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -17,7 +17,7 @@
 #include <set>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace ui { class XContextChangeEventListener; } } } }
+namespace com::sun::star::ui { class XContextChangeEventListener; }
 
 class NotebookbarContextControl;
 class SystemWindow;
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index e4430b2415f3..1df0137cdcee 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -107,9 +107,9 @@ namespace basegfx {
     typedef B2IVector B2ISize;
 }
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     class XGraphics;
-} } } }
+}
 
 #if defined UNX
 #define GLYPH_FONT_HEIGHT   128
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index b4d1ac58b1af..12f4a8e1e805 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -37,9 +37,9 @@
 #include <vector>
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace beans { class XMaterialHolder; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
-namespace com { namespace sun { namespace star { namespace security { class XCertificate; } } } }
+namespace com::sun::star::beans { class XMaterialHolder; }
+namespace com::sun::star::io { class XOutputStream; }
+namespace com::sun::star::security { class XCertificate; }
 
 class GDIMetaFile;
 class MapMode;
diff --git a/include/vcl/pngwrite.hxx b/include/vcl/pngwrite.hxx
index 4aa49244df36..de2b1c6e168d 100644
--- a/include/vcl/pngwrite.hxx
+++ b/include/vcl/pngwrite.hxx
@@ -24,8 +24,8 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
 
 class BitmapEx;
 class SvStream;
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index 6857ce9d76be..bf0ea21ec1f4 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -37,10 +37,9 @@ class MouseEvent;
 class CommandEvent;
 namespace vcl { class Window; }
 
-namespace com { namespace sun { namespace star {
-    namespace datatransfer { namespace clipboard {
-        class XClipboard;
-}}}}}
+namespace com::sun::star::datatransfer::clipboard {
+    class XClipboard;
+}
 namespace i18nutil {
     struct SearchOptions;
 }
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index a278a32c0539..efae4d660722 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -31,8 +31,8 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
-namespace com { namespace sun { namespace star { namespace frame { struct FeatureStateEvent; } } } }
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::frame { struct FeatureStateEvent; }
 template <class T> class VclStatusListener;
 
 class Timer;
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index e374192378fb..2ec7c340b69f 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -42,9 +42,9 @@
 #include <com/sun/star/embed/Aspects.hpp>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace datatransfer { namespace dnd { class XDragGestureRecognizer; } } } } }
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace datatransfer { namespace dnd { class XDropTarget; } } } } }
+namespace com::sun::star::datatransfer::dnd { class XDragGestureRecognizer; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::datatransfer::dnd { class XDropTarget; }
 
 namespace tools { template <typename T> class SvRef; }
 template <typename Arg, typename Ret> class Link;
diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 12c7f7361366..4b9ca92f4465 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -16,10 +16,8 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star {
-    namespace beans { struct PropertyValue; }
-} } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
 
 class UIObject;
 
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 9f97fd6bd974..a95474417cf6 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -26,11 +26,11 @@
 #include <osl/mutex.hxx>
 #include <vcl/dllapi.h>
 
-namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
+namespace com::sun::star::datatransfer::clipboard {
     class XClipboard;
-} } } } }
+}
 
-namespace vcl { namespace unohelper {
+namespace vcl::unohelper {
 
     class VCL_DLLPUBLIC TextDataObject final :
                             public css::datatransfer::XTransferable,
@@ -68,7 +68,7 @@ namespace vcl { namespace unohelper {
             ::osl::Mutex& GetMutex() { return maMutex; }
     };
 
-}}  // namespace vcl::unohelper
+}  // namespace vcl::unohelper
 
 #endif // INCLUDED_VCL_UNOHELP2_HXX
 
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index c1f07e835594..170cd40ec65f 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -27,11 +27,9 @@
 
 class Menu;
 
-namespace com { namespace sun { namespace star {
-    namespace accessibility {
-        class XAccessible;
-    }
-}}}
+namespace com::sun::star::accessibility {
+    class XAccessible;
+}
 
 namespace vcl
 {
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 7c794933da3e..0910257c49f5 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -35,7 +35,7 @@
 
 class VclReferenceBase;
 
-namespace vcl { namespace detail {
+namespace vcl::detail {
 
 template<typename>
 constexpr bool isIncompleteOrDerivedFromVclReferenceBase(...) { return true; }
@@ -44,7 +44,7 @@ template<typename T> constexpr bool isIncompleteOrDerivedFromVclReferenceBase(
     int (*)[sizeof(T)])
 { return std::is_base_of<VclReferenceBase, T>::value; }
 
-}; }; // namespace detail, namespace vcl
+} // namespace vcl::detail
 
 /**
  * A thin wrapper around rtl::Reference to implement the acquire and dispose semantics we want for references to vcl::Window subclasses.
diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx
index f982537da67d..62e7617cdb56 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -27,7 +27,7 @@
 #include <deque>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace graphic { class XPrimitive2D; } } } }
+namespace com::sun::star::graphic { class XPrimitive2D; }
 struct WmfExternal;
 
 typedef css::uno::Sequence<sal_Int8> VectorGraphicDataArray;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index e4406f9ef8cd..3d1ce91c93a6 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -67,31 +67,31 @@ enum class ImplPaintFlags;
 enum class VclEventId;
 enum class PointerStyle;
 
-namespace com { namespace sun { namespace star {
-namespace accessibility {
-    struct AccessibleRelation;
-    class XAccessible;
+namespace com::sun::star {
+    namespace accessibility {
+        struct AccessibleRelation;
+        class XAccessible;
+    }
+    namespace rendering {
+        class XCanvas;
+        class XSpriteCanvas;
+    }
+    namespace awt {
+        class XWindowPeer;
+    }
+    namespace uno {
+        class Any;
+    }
+    namespace datatransfer::clipboard {
+        class XClipboard;
+    }
+    namespace datatransfer::dnd {
+        class XDragGestureRecognizer;
+        class XDragSource;
+        class XDropTarget;
+    }
 }
 
-namespace rendering {
-    class XCanvas;
-    class XSpriteCanvas;
-}
-namespace awt {
-    class XWindowPeer;
-}
-namespace uno {
-    class Any;
-}
-namespace datatransfer { namespace clipboard {
-    class XClipboard;
-}
-namespace dnd {
-    class XDragGestureRecognizer;
-    class XDragSource;
-    class XDropTarget;
-}}}}}
-
 namespace vcl {
     struct ControlLayoutData;
 }
diff --git a/include/vcl/wmfexternal.hxx b/include/vcl/wmfexternal.hxx
index d428151ecf13..d20fdf84d034 100644
--- a/include/vcl/wmfexternal.hxx
+++ b/include/vcl/wmfexternal.hxx
@@ -23,7 +23,7 @@
 #include <vcl/dllapi.h>
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
 
 struct VCL_DLLPUBLIC WmfExternal
 {
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 628d476a9a38..dfc6cc1b3fd0 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -24,7 +24,7 @@
 #include <vcl/syswin.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class Any; }}}}
+namespace com::sun::star::uno { class Any; }
 struct SystemParentData;
 
 
diff --git a/include/xmloff/DashStyle.hxx b/include/xmloff/DashStyle.hxx
index fc21640a380f..e9c5aac073c3 100644
--- a/include/xmloff/DashStyle.hxx
+++ b/include/xmloff/DashStyle.hxx
@@ -26,11 +26,11 @@
 
 class SvXMLImport;
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<class A> class Reference; }
-    namespace xml { namespace sax { class XAttributeList; } }
+    namespace xml::sax { class XAttributeList; }
     namespace uno { class Any; }
-} } }
+}
 
 
 class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLDashStyleImport
diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index 9442147e31d3..94f2fb2b9b28 100644
--- a/include/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
@@ -27,11 +27,11 @@
 
 class SvXMLImport;
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<class A> class Reference; }
-    namespace xml { namespace sax { class XAttributeList; } }
+    namespace xml::sax { class XAttributeList; }
     namespace uno { class Any; }
-} } }
+}
 
 
 class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLGradientStyleImport
diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx
index e556f719da46..17d69fcc825d 100644
--- a/include/xmloff/HatchStyle.hxx
+++ b/include/xmloff/HatchStyle.hxx
@@ -27,11 +27,11 @@
 
 class SvXMLImport;
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<class A> class Reference; }
-    namespace xml { namespace sax { class XAttributeList; } }
+    namespace xml::sax { class XAttributeList; }
     namespace uno { class Any; }
-} } }
+}
 
 
 class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLHatchStyleImport
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index ce2af86d62c8..3b017faa2120 100644
--- a/include/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
@@ -25,9 +25,9 @@
 #include <xmloff/dllapi.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::xml::sax { class XAttributeList; }
 
 class SvXMLExport;
 class SvXMLImport;
diff --git a/include/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx
index 3cf49ae9e7b7..947039d435b3 100644
--- a/include/xmloff/MarkerStyle.hxx
+++ b/include/xmloff/MarkerStyle.hxx
@@ -27,11 +27,11 @@
 
 class SvXMLImport;
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<class A> class Reference; }
-    namespace xml { namespace sax { class XAttributeList; } }
+    namespace xml::sax { class XAttributeList; }
     namespace uno { class Any; }
-} } }
+}
 
 
 class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLMarkerStyleImport
diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx
index 7d6fa466880f..09031b2ccc21 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -25,10 +25,10 @@
 #include <xmloff/families.hxx>
 #include <xmloff/xmltkmap.hxx>
 
-namespace com { namespace sun { namespace star { namespace chart { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com::sun::star::chart { class XChartDocument; }
+namespace com::sun::star::beans { class XPropertySet; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame {
         class XModel;
     }
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star {
         class XChartDocument;
         class XDataSeries;
     }
-}}}
+}
 
 class SvXMLStylesContext;
 class SvXMLImportContext;
diff --git a/include/xmloff/SchXMLSeriesHelper.hxx b/include/xmloff/SchXMLSeriesHelper.hxx
index c8857ae06370..78c729306123 100644
--- a/include/xmloff/SchXMLSeriesHelper.hxx
+++ b/include/xmloff/SchXMLSeriesHelper.hxx
@@ -27,10 +27,10 @@
 #include <vector>
 #include <map>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::chart2 { class XDataSeries; }
+namespace com::sun::star::chart2 { class XDiagram; }
+namespace com::sun::star::frame { class XModel; }
 
 class XMLOFF_DLLPUBLIC SchXMLSeriesHelper
 {
diff --git a/include/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx
index 505ecce1b00a..0937935a9c39 100644
--- a/include/xmloff/SettingsExportHelper.hxx
+++ b/include/xmloff/SettingsExportHelper.hxx
@@ -24,16 +24,16 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace formula { struct SymbolDescriptor; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XStringSubstitution; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::formula { struct SymbolDescriptor; }
+namespace com::sun::star::util { class XStringSubstitution; }
 
 namespace com
 {
-    namespace sun { namespace star {
+    namespace sun::star {
         namespace container { class XNameAccess; class XIndexAccess; }
         namespace util { struct DateTime; }
-    } }
+    }
 }
 
 namespace xmloff
diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx
index 052aeef6ee93..0377c46bb09f 100644
--- a/include/xmloff/SinglePropertySetInfoCache.hxx
+++ b/include/xmloff/SinglePropertySetInfoCache.hxx
@@ -26,8 +26,8 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { class XPropertySetInfo; }
 
 class SinglePropertySetInfoCache
 {
diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx
index 9ec437ea0784..298158db1329 100644
--- a/include/xmloff/XMLBase64ImportContext.hxx
+++ b/include/xmloff/XMLBase64ImportContext.hxx
@@ -25,10 +25,8 @@
 #include <xmloff/dllapi.h>
 #include <xmloff/xmlictxt.hxx>
 
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
-
-namespace com { namespace sun { namespace star { namespace io {
-    class XOutputStream; } } } }
+namespace com::sun::star::xml::sax { class XAttributeList; }
+namespace com::sun::star::io { class XOutputStream; }
 
 class XMLOFF_DLLPUBLIC XMLBase64ImportContext final : public SvXMLImportContext
 {
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index 364878e38dfe..bb118dc212c7 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -22,7 +22,7 @@
 #include <xmloff/dllapi.h>
 #include <xmloff/xmlictxt.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext
 {
diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx
index 98caf8502232..d37cb6717399 100644
--- a/include/xmloff/XMLEventExport.hxx
+++ b/include/xmloff/XMLEventExport.hxx
@@ -30,15 +30,15 @@
 #include <memory>
 
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace document { class XEventsSupplier; }
     namespace container { class XNameReplace; }
     namespace container { class XNameAccess; }
     namespace beans { struct PropertyValue; }
-} } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
 
 typedef ::std::map< OUString, std::unique_ptr<XMLEventExportHandler> > HandlerMap;
 typedef ::std::map< OUString, XMLEventName > NameMap;
diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index 8e98853796d1..4fb08ffb9d40 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -27,14 +27,14 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+    namespace xml::sax { class XAttributeList; }
     namespace beans { struct PropertyValue; }
     namespace container { class XNameReplace; }
     namespace document { class XEventsSupplier; }
-} } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 typedef ::std::pair<
             OUString,
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index 818b79b66c24..9800502f60a5 100644
--- a/include/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
@@ -29,11 +29,11 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace style { class XStyle; }
     namespace container { class XNameAccess;}
     namespace beans { class XPropertySet; }
-} } }
+}
 
 class SvXMLExport;
 class XMLPropertyHandlerFactory;
diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx
index aad2db51ecd8..1daf35ada17c 100644
--- a/include/xmloff/XMLSettingsExportContext.hxx
+++ b/include/xmloff/XMLSettingsExportContext.hxx
@@ -22,7 +22,7 @@
 
 #include <xmloff/xmltoken.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 
 namespace xmloff
diff --git a/include/xmloff/XMLTextListAutoStylePool.hxx b/include/xmloff/XMLTextListAutoStylePool.hxx
index 9f40ac48de60..6237cda709e7 100644
--- a/include/xmloff/XMLTextListAutoStylePool.hxx
+++ b/include/xmloff/XMLTextListAutoStylePool.hxx
@@ -28,9 +28,8 @@
 #include <memory>
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace container {
-    class XIndexReplace; } } } }
-namespace com { namespace sun { namespace star { namespace ucb { class XAnyCompare; } } } }
+namespace com::sun::star::container { class XIndexReplace; }
+namespace com::sun::star::ucb { class XAnyCompare; }
 
 
 class XMLTextListAutoStylePool_Impl;
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx
index 70503a5cc631..4f9592e3235c 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -25,9 +25,9 @@
 
 #include <xmloff/xmlstyle.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace style { class XStyle; }
-} } }
+}
 
 class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext
 {
diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx
index 907652e898e5..57f02ec88620 100644
--- a/include/xmloff/XMLTextMasterPageExport.hxx
+++ b/include/xmloff/XMLTextMasterPageExport.hxx
@@ -24,9 +24,9 @@
 #include <xmloff/dllapi.h>
 #include <xmloff/XMLPageExport.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace text { class XText; }
-} } }
+}
 
 class XMLOFF_DLLPUBLIC XMLTextMasterPageExport : public XMLPageExport
 {
diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx
index 8c7d478cb698..644d98b865bf 100644
--- a/include/xmloff/animationexport.hxx
+++ b/include/xmloff/animationexport.hxx
@@ -26,9 +26,9 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::animations { class XAnimationNode; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 class SvXMLExport;
 
diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index 2722869c5ea5..8f20dce4f86c 100644
--- a/include/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
@@ -23,8 +23,8 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 class AnimExpImpl;
 class SvXMLExport;
diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index 8800c709aacd..bd0b72e24e46 100644
--- a/include/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
@@ -26,13 +26,13 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     class XControlModel;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 class SvXMLExport;
 
diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx
index 7c77bea0816b..5d3b25948ae6 100644
--- a/include/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
@@ -26,9 +26,9 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::xml::sax { class XAttributeList; }
 
 class SvXMLImport;
 class SvXMLImportContext;
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index 0c32b595f3f7..8414fba6c3b4 100644
--- a/include/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
@@ -28,8 +28,8 @@
 
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com::sun::star::util { class XNumberFormats; }
+namespace com::sun::star::util { class XNumberFormatsSupplier; }
 
 class SvXMLExport;
 
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index ef42a6ad5e5c..f1bf99e6e859 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -29,11 +29,11 @@
 
 struct XMLPropertyState;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XPropertySet; }
-} } }
+}
 
-namespace com { namespace sun { namespace star { namespace style { class XStyle; } } } }
+namespace com::sun::star::style { class XStyle; }
 
 typedef std::unordered_set<OUString> OldFillStyleDefinitionSet;
 
diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx
index 2cd0bc196e04..ba5526f72195 100644
--- a/include/xmloff/settingsstore.hxx
+++ b/include/xmloff/settingsstore.hxx
@@ -14,9 +14,9 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 // Scans list of properties for certain URL properties that could refer
 // to internal objects, and initializes from these.
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index e91ff36ec071..ff38aeaf4cab 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -34,10 +34,10 @@
 #include <xmloff/txtparae.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } }
-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::awt { struct Point; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::drawing { class XShapes; }
 
 class XMLTableExport;
 class SvXMLAttributeList;
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 4ccd94d9e432..810665d354ec 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -32,11 +32,11 @@
 #include <vector>
 #include <memory>
 
-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 { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::drawing { class XShapes; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::xml::sax { class XAttributeList; }
 
 class SvXMLImport;
 class SvXMLTokenMap;
diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx
index db7f11616863..4cd11971ccee 100644
--- a/include/xmloff/styleexp.hxx
+++ b/include/xmloff/styleexp.hxx
@@ -25,10 +25,10 @@
 
 #include <salhelper/simplereferenceobject.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 namespace rtl { template <class reference_type> class Reference; }
 
-namespace com { namespace sun { namespace star
+namespace com::sun::star
 {
     namespace style
     {
@@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star
         class XNameAccess;
     }
 
-} } }
+}
 
 class SvXMLExportPropertyMapper;
 class SvXMLAutoStylePoolP;
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index db79f9c24dbd..22f4b339c3ca 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -47,7 +47,7 @@ namespace xmloff {
     struct ParsedRDFaAttributes;
 }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 namespace text {
     class XText;
     class XTextCursor;
@@ -58,9 +58,9 @@ namespace text {
 namespace frame { class XModel; }
 namespace container { class XNameContainer; class XIndexReplace; }
 namespace beans { class XPropertySet; }
-namespace xml { namespace sax { class XAttributeList; } }
+namespace xml::sax { class XAttributeList; }
 namespace util { struct DateTime; }
-} } }
+}
 
 namespace rtl { template <class reference_type> class Reference; }
 
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index a46b3e6e5974..80131b11e9f7 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -45,7 +45,7 @@ class MultiPropertySetHelper;
 enum class XMLShapeExportFlags;
 class SvXMLExportPropertyMapper;
 
-namespace com { namespace sun { namespace star
+namespace com::sun::star
 {
     namespace beans { class XPropertySet; class XPropertyState;
                       class XPropertySetInfo; }
@@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star
     namespace text { class XTextContent; class XTextRange; class XText;
                      class XFootnote; class XTextFrame; class XTextSection;
                      class XTextField; }
-} } }
+}
 
 namespace xmloff
 {
diff --git a/include/xmloff/xformsexport.hxx b/include/xmloff/xformsexport.hxx
index 5911d4a0c41f..4ab7034ecf5a 100644
--- a/include/xmloff/xformsexport.hxx
+++ b/include/xmloff/xformsexport.hxx
@@ -23,12 +23,12 @@
 #include <rtl/ustring.hxx>
 
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<typename T> class Reference; }
     namespace uno { template<typename T> class Sequence; }
     namespace beans { class XPropertySet; struct PropertyValue; }
     namespace container { class XNameAccess; }
-} } }
+}
 
 
 /** export an XForms model. */
diff --git a/include/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx
index 5975ea993416..b580af57608b 100644
--- a/include/xmloff/xformsimport.hxx
+++ b/include/xmloff/xformsimport.hxx
@@ -26,13 +26,13 @@
 class SvXMLImport;
 class SvXMLImportContext;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<typename T> class Reference; }
     namespace uno { template <typename > class Sequence; }
     namespace beans { class XPropertySet; struct PropertyValue; }
     namespace frame { class XModel; }
     namespace container { class XNameAccess; }
-} } }
+}
 
 /** create import context for xforms:model element. */
 XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext(
diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index 4f754c170f25..ed389d9530bb 100644
--- a/include/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
@@ -36,13 +36,13 @@ class SvXMLUnitConverter;
 struct XMLPropertyState;
 enum class XmlStyleFamily;
 
-namespace com { namespace sun { namespace star { namespace uno
-    { template<typename A> class Sequence; }
-} } }
+namespace com::sun::star::uno {
+    template<typename A> class Sequence;
+}
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
+namespace com::sun::star::xml::sax { class XDocumentHandler; }
 namespace xmloff { struct AutoStyleEntry; }
 namespace rtl { template <class reference_type> class Reference; }
 
diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx
index f6b0479c0a30..2b4c8717d50c 100644
--- a/include/xmloff/xmlerror.hxx
+++ b/include/xmloff/xmlerror.hxx
@@ -87,11 +87,11 @@ namespace o3tl
     template<> struct typed_flags<SvXMLErrorFlags> : is_typed_flags<SvXMLErrorFlags, 0x7> {};
 }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<class X> class Sequence; }
     namespace uno { template<class X> class Reference; }
-    namespace xml { namespace sax { class XLocator; } }
-} } }
+    namespace xml::sax { class XLocator; }
+}
 
 class ErrorRecord;
 
diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx
index f365a2ce4417..c212e4415e73 100644
--- a/include/xmloff/xmlevent.hxx
+++ b/include/xmloff/xmlevent.hxx
@@ -22,8 +22,8 @@
 
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
 
 
 /**
@@ -32,10 +32,10 @@ namespace com { namespace sun { namespace star { namespace uno { template <typen
  * Several definition used in im- and export of events
  */
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+    namespace xml::sax { class XAttributeList; }
     namespace beans { struct PropertyValue; }
-} } }
+}
 
 class SvXMLExport;
 class SvXMLImportContext;
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index e1c9b2eb6129..75595d35ea29 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -54,19 +54,19 @@
 #include <memory>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace document { class XEmbeddedObjectResolver; } } } }
-namespace com { namespace sun { namespace star { namespace document { class XGraphicStorageHandler; } } } }
-namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } }
-namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XExtendedDocumentHandler; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XLocator; } } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::document { class XEmbeddedObjectResolver; }
+namespace com::sun::star::document { class XGraphicStorageHandler; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::lang { class XEventListener; }
+namespace com::sun::star::task { class XStatusIndicator; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XNumberFormatsSupplier; }
+namespace com::sun::star::xml::sax { class XAttributeList; }
+namespace com::sun::star::xml::sax { class XDocumentHandler; }
+namespace com::sun::star::xml::sax { class XExtendedDocumentHandler; }
+namespace com::sun::star::xml::sax { class XLocator; }
 
 class SvXMLNamespaceMap;
 class SvXMLExport_Impl;
@@ -80,10 +80,10 @@ enum class SvXMLErrorFlags;
 // Shapes in Writer cannot be named via context menu (#i51726#)
 #include <unotools/moduleoptions.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace frame { class XModel; }
     namespace lang { struct Locale; }
-} } }
+}
 namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; }
 
 enum class SvXMLExportFlags {
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 84d2d60c2fb5..f2f1e6adf72e 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -29,8 +29,8 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::beans { class XPropertySet; }
 namespace rtl { template <class reference_type> class Reference; }
 
 class XMLPropertySetMapper;
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 5ab75bce286e..64927daf693b 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -29,7 +29,7 @@
 #include <xmloff/nmspmap.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com::sun::star::xml::sax { class XAttributeList; }
 
 class SvXMLImport;
 
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 9b9052e46f1a..39990af79d7a 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -47,23 +47,23 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
-namespace com { namespace sun { namespace star { namespace document { class XEmbeddedObjectResolver; } } } }
-namespace com { namespace sun { namespace star { namespace document { class XGraphicStorageHandler; } } } }
-namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
-namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastAttributeList; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastContextHandler; } } } } }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { struct NamedValue; }
+namespace com::sun::star::document { class XEmbeddedObjectResolver; }
+namespace com::sun::star::document { class XGraphicStorageHandler; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::task { class XStatusIndicator; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XNumberFormatsSupplier; }
+namespace com::sun::star::xml::sax { class XAttributeList; }
+namespace com::sun::star::xml::sax { class XFastAttributeList; }
+namespace com::sun::star::xml::sax { class XFastContextHandler; }
+namespace com::sun::star {
     namespace frame { class XModel; }
     namespace io { class XOutputStream; }
     namespace rdf { class XMetadatable; }
-} } }
+}
 
 namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; }
 namespace comphelper { class AttributeList; }
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index de10dd3b7b10..5f5a72d17cb3 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -28,15 +28,15 @@
 #include <vector>
 #include <salhelper/simplereferenceobject.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { class XMultiPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XTolerantMultiPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com::sun::star::beans { class XMultiPropertySet; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { class XPropertySetInfo; }
+namespace com::sun::star::beans { class XTolerantMultiPropertySet; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
+namespace com::sun::star::xml::sax { class XAttributeList; }
 
 struct XMLPropertyState;
 class XMLPropertySetMapper;
diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx
index 505d31382266..2dc6ec2f3dc3 100644
--- a/include/xmloff/xmlmetae.hxx
+++ b/include/xmloff/xmlmetae.hxx
@@ -32,8 +32,8 @@
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
-namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
-namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } }
+namespace com::sun::star::document { class XDocumentProperties; }
+namespace com::sun::star::util { struct DateTime; }
 
 
 class SvXMLExport;
diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx
index ca908b41c114..b35291adc707 100644
--- a/include/xmloff/xmlmetai.hxx
+++ b/include/xmloff/xmlmetai.hxx
@@ -25,9 +25,9 @@
 #include <xmloff/xmlictxt.hxx>
 
 
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace dom { class XSAXDocumentBuilder2; } } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::document { class XDocumentProperties; }
+namespace com::sun::star::xml::dom { class XSAXDocumentBuilder2; }
 
 /// handles the top-level office:document-meta element of meta.xml documents
 // NB: virtual inheritance is needed so that the context that handles the
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index a7615930db4b..683d3025d4dd 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -23,14 +23,14 @@
 #include <rtl/ustring.hxx>
 #include <xmloff/dllapi.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace style { class XStyle; }
     namespace container { class XIndexReplace; }
     namespace beans { struct PropertyValue; }
-} } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
 class SvXMLExport;
 class XMLTextListAutoStylePool;
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 3798c7bd6977..80388ba758c1 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -28,9 +28,9 @@
 #include <i18nlangtag/lang.h>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com::sun::star::lang { struct Locale; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::util { class XNumberFormatsSupplier; }
 
 #define XML_WRITTENNUMBERSTYLES "WrittenNumberStyles"
 
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index a37335ef67bc..21eac93a3cd9 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -29,9 +29,9 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XNumberFormatsSupplier; }
+namespace com::sun::star::xml::sax { class XAttributeList; }
 
 #define XML_NUMBERSTYLES "NumberStyles"
 
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index ca82d8f55295..baafeeac81ec 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -27,8 +27,8 @@
 
 #include <xmloff/xmlstyle.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XIndexReplace; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::container { class XIndexReplace; }
 
 class SvxXMLListLevelStyleContext_Impl;
 typedef std::vector<rtl::Reference<SvxXMLListLevelStyleContext_Impl>> SvxXMLListStyle_Impl;
diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx
index 7e98304349f8..e0b5a7edcdbc 100644
--- a/include/xmloff/xmlprhdl.hxx
+++ b/include/xmloff/xmlprhdl.hxx
@@ -24,7 +24,7 @@
 #include <xmloff/dllapi.h>
 #include <rtl/ustring.hxx>
 
-namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; } } } }
+namespace com::sun::star::uno { class Any; }
 
 class SvXMLUnitConverter;
 
diff --git a/include/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx
index 06d2e3fcaafa..bfe390dd68b9 100644
--- a/include/xmloff/xmlscripti.hxx
+++ b/include/xmloff/xmlscripti.hxx
@@ -24,9 +24,9 @@
 #include <xmloff/dllapi.h>
 #include <xmloff/xmlictxt.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
     class XModel;
-}}}}
+}
 
 class XMLOFF_DLLPUBLIC XMLScriptContext final : public SvXMLImportContext
 {
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 7b81350e2c31..e6de64251f34 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -32,10 +32,10 @@ class SvXMLStylesContext_Impl;
 class SvXMLImportPropertyMapper;
 class SvXMLTokenMap;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 namespace container { class XNameContainer; }
 namespace style { class XAutoStyleFamily; }
-} } }
+}
 
 enum XMLStyleStylesElemTokens
 {
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 4b4e416a882f..6acceaeae1a5 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -38,7 +38,7 @@
  * methods and the SvXMLElementExport constructor.
  */
 
-namespace xmloff { namespace token {
+namespace xmloff::token {
 
 
     /**
@@ -3370,7 +3370,7 @@ namespace xmloff { namespace token {
     XMLOFF_DLLPUBLIC bool IsXMLToken(
         const sax_fastparser::FastAttributeList::FastAttributeIter& aIter,
         enum XMLTokenEnum eToken );
-} }
+}
 
 #endif
 
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index cbeb41907b16..647472d2b7b5 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -32,22 +32,22 @@
 
 #include <tools/fldunit.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace text { class XNumberingTypeInfo; }
-}}}
+}
 
 namespace basegfx
 {
     class B3DVector;
 }
 
-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 { struct Position3D; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
-namespace com { namespace sun { namespace star { namespace util { struct Date; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::drawing { struct Position3D; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace com::sun::star::util { struct Date; }
 template <typename EnumT> struct SvXMLEnumMapEntry;
 template <typename EnumT> struct SvXMLEnumStringMapEntry;
 
diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index 75772d24c52f..2f65c75e1f42 100644
--- a/include/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
@@ -25,9 +25,9 @@
 
 #include <xmlscript/xmlscriptdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+namespace com::sun::star::xml::sax { class XDocumentHandler; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
 
 namespace xmlscript
 {
diff --git a/include/xmlscript/xmldlg_imexp.hxx b/include/xmlscript/xmldlg_imexp.hxx
index fcacfbf6d898..5472c0dd2659 100644
--- a/include/xmlscript/xmldlg_imexp.hxx
+++ b/include/xmlscript/xmldlg_imexp.hxx
@@ -23,13 +23,13 @@
 
 #include <xmlscript/xmlscriptdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XInputStreamProvider; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XExtendedDocumentHandler; } } } } }
+namespace com::sun::star::container { class XNameContainer; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XInputStreamProvider; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::xml::sax { class XDocumentHandler; }
+namespace com::sun::star::xml::sax { class XExtendedDocumentHandler; }
 
 namespace xmlscript
 {
diff --git a/include/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx
index 68eb292296c5..0e79995831f6 100644
--- a/include/xmlscript/xmllib_imexp.hxx
+++ b/include/xmlscript/xmllib_imexp.hxx
@@ -25,8 +25,8 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XWriter; } } } } }
+namespace com::sun::star::xml::sax { class XDocumentHandler; }
+namespace com::sun::star::xml::sax { class XWriter; }
 
 namespace xmlscript
 {
diff --git a/include/xmlscript/xmlmod_imexp.hxx b/include/xmlscript/xmlmod_imexp.hxx
index df0c4cabae15..130c32ba8c73 100644
--- a/include/xmlscript/xmlmod_imexp.hxx
+++ b/include/xmlscript/xmlmod_imexp.hxx
@@ -23,8 +23,8 @@
 #include <rtl/ustring.hxx>
 #include <xmlscript/xmlscriptdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XWriter; } } } } }
+namespace com::sun::star::xml::sax { class XDocumentHandler; }
+namespace com::sun::star::xml::sax { class XWriter; }
 
 namespace xmlscript
 {
diff --git a/sfx2/inc/sidebar/ControlFactory.hxx b/sfx2/inc/sidebar/ControlFactory.hxx
index 7deebf1ab92c..15ae45ef4c81 100644
--- a/sfx2/inc/sidebar/ControlFactory.hxx
+++ b/sfx2/inc/sidebar/ControlFactory.hxx
@@ -26,7 +26,7 @@ class CheckBox;
 class RadioButton;
 namespace vcl { class Window; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** Factory for controls used in sidebar panels.
     The reason to use this factory instead of creating the controls
@@ -44,7 +44,7 @@ public:
 };
 
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 #endif
 
diff --git a/sfx2/inc/sidebar/UnoSidebar.hxx b/sfx2/inc/sidebar/UnoSidebar.hxx
index 86280d2e6bc9..20ffa22b19bd 100644
--- a/sfx2/inc/sidebar/UnoSidebar.hxx
+++ b/sfx2/inc/sidebar/UnoSidebar.hxx
@@ -18,7 +18,7 @@
 namespace com::sun::star::frame { class XFrame; }
 namespace com::sun::star::ui { class XDecks; }
 namespace com::sun::star::ui { class XSidebar; }
-namespace sfx2 { namespace sidebar { class SidebarController; } }
+namespace sfx2::sidebar { class SidebarController; }
 
 /** get the sidebar for a given frame
 */
author	Noel Grandin <noel.grandin@collabora.co.uk>	2020-05-01 14:52:05 +0200
committer	Noel Grandin <noel.grandin@collabora.co.uk>	2020-05-03 09:21:51 +0200
commit	47cd34a60ff9048404075823e519f1abdd4b0e9a (patch)
tree	e9728dd7c686d23f90b4331f105d6f5f8c1176cd
parent	c79dd92480cbc409a7061da7f3dd3abaaf9a4883 (diff)