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>

88 files changed, 251 insertions, 251 deletions

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 {