compact namespace in i18npool..oox

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

85 files changed, 181 insertions, 190 deletions

diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 643f8b0b4bdb..03a084b01c5e 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -26,9 +26,7 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
+namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::i18n { class XNativeNumberSupplier; }
 namespace com::sun::star::i18n { class XLocaleData5; }
 namespace i18npool { class Transliteration_casemapping; }
diff --git a/javaunohelper/source/juhx-export-types.hxx b/javaunohelper/source/juhx-export-types.hxx
index 571f5fd39dd9..8e2783452274 100644
--- a/javaunohelper/source/juhx-export-types.hxx
+++ b/javaunohelper/source/juhx-export-types.hxx
@@ -32,7 +32,7 @@
 
 extern "C" {
 
-namespace javaunohelper { namespace detail {
+namespace javaunohelper::detail {
 
 typedef jobject JAVAUNOHELPER_DETAIL_CALLCONV Func_bootstrap(
     JNIEnv *_env, jclass, jstring, jobjectArray, jobject);
@@ -43,7 +43,7 @@ typedef jobject JAVAUNOHELPER_DETAIL_CALLCONV Func_getFactory(
 typedef jboolean JAVAUNOHELPER_DETAIL_CALLCONV Func_writeInfo(
     JNIEnv *, jclass, jstring, jobject, jobject, jobject);
 
-} }
+}
 
 }
 
diff --git a/javaunohelper/source/vm.hxx b/javaunohelper/source/vm.hxx
index 81dd5be69f60..d257c796cd1f 100644
--- a/javaunohelper/source/vm.hxx
+++ b/javaunohelper/source/vm.hxx
@@ -26,9 +26,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ref.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
+namespace com::sun::star::uno { class XComponentContext; }
 namespace jvmaccess { class UnoVirtualMachine; }
 
 namespace javaunohelper {
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 4fba8f5c226e..cef9016b123e 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -49,9 +49,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::linguistic2;
 
-namespace com { namespace sun { namespace star { namespace beans {
-        class XPropertySet;
-}}}}
+namespace com::sun::star::beans { class XPropertySet; }
 
 class Thesaurus :
     public cppu::WeakImplHelper
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 8adb3c99c2d4..85faed923922 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -33,11 +33,11 @@
 #include <unotools/linguprops.hxx>
 #include <com/sun/star/uno/Any.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         struct PropertyChangeEvent;
     }
-}}}
+}
 
 
 // LinguOptions
diff --git a/linguistic/source/lngreg.hxx b/linguistic/source/lngreg.hxx
index 6cbbb0df3135..a127af751b3e 100644
--- a/linguistic/source/lngreg.hxx
+++ b/linguistic/source/lngreg.hxx
@@ -24,9 +24,9 @@
 
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     class XMultiServiceFactory;
-} } } }
+}
 
 extern void * LngSvcMgr_getFactory
 (
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 7262d26b7f04..2eda39ab4753 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -43,13 +43,13 @@ class GrammarCheckingIterator;
 class LngSvcMgrListenerHelper;
 struct SvcInfo;
 
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
     class XLinguServiceEventBroadcaster;
     class XSpellChecker;
     class XProofreadingIterator;
     class XHyphenator;
     class XThesaurus;
-} } } }
+}
 
 
 class LngSvcMgr :
diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx
index ab4f1dab947a..55fd48198387 100644
--- a/linguistic/workben/sprophelp.hxx
+++ b/linguistic/workben/sprophelp.hxx
@@ -26,11 +26,11 @@
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     class   XPropertySet;
 }}}};
 
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
     struct  LinguServiceEvent;
 }}}};
 
diff --git a/oox/inc/drawingml/chart/axisconverter.hxx b/oox/inc/drawingml/chart/axisconverter.hxx
index a46e0aec65f2..f647cc560c23 100644
--- a/oox/inc/drawingml/chart/axisconverter.hxx
+++ b/oox/inc/drawingml/chart/axisconverter.hxx
@@ -22,10 +22,10 @@
 
 #include <drawingml/chart/converterbase.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace chart2 { class XAxis; }
     namespace chart2 { class XCoordinateSystem; }
-} } }
+}
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/chart/chartcontextbase.hxx b/oox/inc/drawingml/chart/chartcontextbase.hxx
index 9378d71b65f0..6669536d3524 100644
--- a/oox/inc/drawingml/chart/chartcontextbase.hxx
+++ b/oox/inc/drawingml/chart/chartcontextbase.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/core/fragmenthandler2.hxx>
 
-namespace oox { namespace drawingml { class Shape; } }
+namespace oox::drawingml { class Shape; }
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/chart/chartspaceconverter.hxx b/oox/inc/drawingml/chart/chartspaceconverter.hxx
index 9b985d15f04e..82f848374a9a 100644
--- a/oox/inc/drawingml/chart/chartspaceconverter.hxx
+++ b/oox/inc/drawingml/chart/chartspaceconverter.hxx
@@ -22,9 +22,9 @@
 
 #include <drawingml/chart/converterbase.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace drawing { class XShapes; }
-} } }
+}
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx
index 9a29783ec027..252c5314cdfc 100644
--- a/oox/inc/drawingml/chart/converterbase.hxx
+++ b/oox/inc/drawingml/chart/converterbase.hxx
@@ -22,18 +22,15 @@
 
 #include <drawingml/chart/objectformatter.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Rectangle; }
     namespace awt { struct Size; }
     namespace chart2 { class XChartDocument; }
     namespace chart2 { class XTitle; }
     namespace drawing { class XShape; }
     namespace uno { class XComponentContext; }
-} } }
-
-namespace oox { namespace core {
-    class XmlFilterBase;
-} }
+}
+namespace oox::core { class XmlFilterBase; }
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/chart/datasourceconverter.hxx b/oox/inc/drawingml/chart/datasourceconverter.hxx
index b4c4ac1d6862..67e1ac0c739c 100644
--- a/oox/inc/drawingml/chart/datasourceconverter.hxx
+++ b/oox/inc/drawingml/chart/datasourceconverter.hxx
@@ -22,9 +22,9 @@
 
 #include <drawingml/chart/converterbase.hxx>
 
-namespace com { namespace sun { namespace star {
-    namespace chart2 { namespace data { class XDataSequence; } }
-} } }
+namespace com::sun::star {
+    namespace chart2::data { class XDataSequence; }
+}
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx
index 8282844b1ab3..9ccf5e437d87 100644
--- a/oox/inc/drawingml/chart/objectformatter.hxx
+++ b/oox/inc/drawingml/chart/objectformatter.hxx
@@ -24,11 +24,11 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/drawingml/chart/modelbase.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace chart2 { class XChartDocument; }
-} } }
+}
 
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx b/oox/inc/drawingml/chart/plotareaconverter.hxx
index fef3620358c9..5c9a938726e1 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -22,9 +22,9 @@
 
 #include <drawingml/chart/converterbase.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace chart2 { class XDiagram; }
-} } }
+}
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/chart/seriesconverter.hxx b/oox/inc/drawingml/chart/seriesconverter.hxx
index 0e5443519b47..afa5127f6635 100644
--- a/oox/inc/drawingml/chart/seriesconverter.hxx
+++ b/oox/inc/drawingml/chart/seriesconverter.hxx
@@ -23,10 +23,10 @@
 #include <drawingml/chart/converterbase.hxx>
 #include <drawingml/chart/seriesmodel.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace chart2 { class XDataSeries; }
-    namespace chart2 { namespace data { class XLabeledDataSequence; } }
-} } }
+    namespace chart2::data { class XLabeledDataSequence; }
+}
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/chart/titleconverter.hxx b/oox/inc/drawingml/chart/titleconverter.hxx
index 3fab40a0690c..78e671b61637 100644
--- a/oox/inc/drawingml/chart/titleconverter.hxx
+++ b/oox/inc/drawingml/chart/titleconverter.hxx
@@ -22,14 +22,14 @@
 
 #include <drawingml/chart/converterbase.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace chart2 { class XDiagram; }
     namespace chart2 { class XFormattedString; }
     namespace chart2 { class XTitled; }
-    namespace chart2 { namespace data { class XDataSequence; } }
-} } }
+    namespace chart2::data { class XDataSequence; }
+}
 
-namespace oox { namespace drawingml { struct TextCharacterProperties; } }
+namespace oox::drawingml { struct TextCharacterProperties; }
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx b/oox/inc/drawingml/chart/typegroupconverter.hxx
index c57c7eaa8fd0..eeddd5fd7eea 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -22,13 +22,13 @@
 
 #include <drawingml/chart/converterbase.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace chart2 { class XChartType; }
     namespace chart2 { class XCoordinateSystem; }
     namespace chart2 { class XDataSeries; }
     namespace chart2 { class XDiagram; }
-    namespace chart2 { namespace data { class XLabeledDataSequence; } }
-} } }
+    namespace chart2::data { class XLabeledDataSequence; }
+}
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/clrschemecontext.hxx b/oox/inc/drawingml/clrschemecontext.hxx
index d6cc3f350536..5e7cddfb8d03 100644
--- a/oox/inc/drawingml/clrschemecontext.hxx
+++ b/oox/inc/drawingml/clrschemecontext.hxx
@@ -25,7 +25,7 @@
 #include <oox/drawingml/color.hxx>
 #include <drawingml/colorchoicecontext.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class clrMapContext final : public oox::core::ContextHandler2
 {
@@ -55,7 +55,7 @@ private:
     ClrScheme&      mrClrScheme;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
 
diff --git a/oox/inc/drawingml/customshapegeometry.hxx b/oox/inc/drawingml/customshapegeometry.hxx
index ff95b8b4bbbc..e02a693b40ee 100644
--- a/oox/inc/drawingml/customshapegeometry.hxx
+++ b/oox/inc/drawingml/customshapegeometry.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <oox/drawingml/shape.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 
 // CT_CustomGeometry2D
@@ -61,7 +61,7 @@ private:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
 
diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx
index 3caf8e150824..a8f4c19b051b 100644
--- a/oox/inc/drawingml/customshapeproperties.hxx
+++ b/oox/inc/drawingml/customshapeproperties.hxx
@@ -30,7 +30,7 @@
 #include <oox/helper/propertymap.hxx>
 #include <oox/token/tokens.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class CustomShapeProperties;
 
@@ -150,7 +150,7 @@ private:
     sal_Int32 mnArcNum;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 
diff --git a/oox/inc/drawingml/embeddedwavaudiofile.hxx b/oox/inc/drawingml/embeddedwavaudiofile.hxx
index ebf20dab06ec..cea644666249 100644
--- a/oox/inc/drawingml/embeddedwavaudiofile.hxx
+++ b/oox/inc/drawingml/embeddedwavaudiofile.hxx
@@ -25,13 +25,13 @@
 #include <oox/core/relations.hxx>
 #include <oox/helper/attributelist.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
     OUString getEmbeddedWAVAudioFile(
             const ::oox::core::Relations& rRelations,
             const AttributeList& rAttribs );
 
-} }
+}
 
 
 #endif
diff --git a/oox/inc/drawingml/fillproperties.hxx b/oox/inc/drawingml/fillproperties.hxx
index be791ac8f9ff..10df9d9d902b 100644
--- a/oox/inc/drawingml/fillproperties.hxx
+++ b/oox/inc/drawingml/fillproperties.hxx
@@ -32,9 +32,9 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace graphic { class XGraphic; }
-} } }
+}
 
 namespace oox {
     class GraphicHelper;
diff --git a/oox/inc/drawingml/guidcontext.hxx b/oox/inc/drawingml/guidcontext.hxx
index 79c03ffb9e52..c60ad75e7a21 100644
--- a/oox/inc/drawingml/guidcontext.hxx
+++ b/oox/inc/drawingml/guidcontext.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
     class GuidContext final : public ::oox::core::ContextHandler2
     {
@@ -34,7 +34,7 @@ namespace oox { namespace drawingml {
     private:
         OUString& mrGuidId;
     };
-} }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/linepropertiescontext.hxx b/oox/inc/drawingml/linepropertiescontext.hxx
index 5f11d50c634b..fc7326008da9 100644
--- a/oox/inc/drawingml/linepropertiescontext.hxx
+++ b/oox/inc/drawingml/linepropertiescontext.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 
 struct LineProperties;
@@ -42,7 +42,7 @@ private:
     LineProperties& mrLineProperties;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/objectdefaultcontext.hxx b/oox/inc/drawingml/objectdefaultcontext.hxx
index ea5474b02f09..703b03097673 100644
--- a/oox/inc/drawingml/objectdefaultcontext.hxx
+++ b/oox/inc/drawingml/objectdefaultcontext.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class Theme;
 
@@ -36,7 +36,7 @@ private:
     Theme& mrTheme;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/scene3dcontext.hxx b/oox/inc/drawingml/scene3dcontext.hxx
index 544b25443ab9..efc9e694f659 100644
--- a/oox/inc/drawingml/scene3dcontext.hxx
+++ b/oox/inc/drawingml/scene3dcontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <drawingml/shape3dproperties.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 struct Shape3DProperties;
 
@@ -60,7 +60,7 @@ private:
     Shape3DProperties& mr3DProperties;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/shape3dproperties.hxx b/oox/inc/drawingml/shape3dproperties.hxx
index 2fb3dad588c4..edddb260a1a9 100644
--- a/oox/inc/drawingml/shape3dproperties.hxx
+++ b/oox/inc/drawingml/shape3dproperties.hxx
@@ -25,7 +25,7 @@
 
 namespace oox { class PropertyMap; }
 namespace oox { class PropertySet; }
-namespace oox { namespace core { class ModelObjectContainer; } }
+namespace oox::core { class ModelObjectContainer; }
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/shapepropertiescontext.hxx b/oox/inc/drawingml/shapepropertiescontext.hxx
index 5d1e41ccabed..6736403f6063 100644
--- a/oox/inc/drawingml/shapepropertiescontext.hxx
+++ b/oox/inc/drawingml/shapepropertiescontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <oox/drawingml/shape.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class ShapePropertiesContext : public ::oox::core::ContextHandler2
 {
@@ -36,7 +36,7 @@ protected:
     Shape&              mrShape;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/shapestylecontext.hxx b/oox/inc/drawingml/shapestylecontext.hxx
index 96926ad6d678..8a2cf9f904fd 100644
--- a/oox/inc/drawingml/shapestylecontext.hxx
+++ b/oox/inc/drawingml/shapestylecontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/drawingml/shape.hxx>
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class ShapeStyleContext final : public ::oox::core::ContextHandler2
 {
@@ -37,7 +37,7 @@ private:
     Shape&              mrShape;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
 
diff --git a/oox/inc/drawingml/spdefcontext.hxx b/oox/inc/drawingml/spdefcontext.hxx
index acdc2537c57a..6b046af5b61a 100644
--- a/oox/inc/drawingml/spdefcontext.hxx
+++ b/oox/inc/drawingml/spdefcontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/drawingml/shape.hxx>
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class spDefContext final : public oox::core::ContextHandler2
 {
@@ -35,7 +35,7 @@ private:
     Shape& mrDefaultObject;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
index 0554d0bbe25f..d905974970fa 100644
--- a/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <drawingml/table/tablestyle.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableBackgroundStyleContext final : public ::oox::core::ContextHandler2
 {
@@ -38,7 +38,7 @@ private:
     TableStyle& mrTableStyle;
 };
 
-} } }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx
index e5b39ea6fdcb..d6e91da042f7 100644
--- a/oox/inc/drawingml/table/tablecell.hxx
+++ b/oox/inc/drawingml/table/tablecell.hxx
@@ -27,7 +27,7 @@
 #include <drawingml/fillproperties.hxx>
 #include <drawingml/lineproperties.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableCellContext;
 class TableProperties;
@@ -102,7 +102,7 @@ private:
     sal_Int32 mnHorzOverflowToken;
 };
 
-} } }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
 
diff --git a/oox/inc/drawingml/table/tablecellcontext.hxx b/oox/inc/drawingml/table/tablecellcontext.hxx
index a4f03326adc5..b4c32cdb67cc 100644
--- a/oox/inc/drawingml/table/tablecellcontext.hxx
+++ b/oox/inc/drawingml/table/tablecellcontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <drawingml/table/tablecell.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableCellContext : public ::oox::core::ContextHandler2
 {
@@ -39,7 +39,7 @@ private:
     TableCell& mrTableCell;
 };
 
-} } }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/table/tablecontext.hxx b/oox/inc/drawingml/table/tablecontext.hxx
index 3cfe54152272..a6866ec2c18f 100644
--- a/oox/inc/drawingml/table/tablecontext.hxx
+++ b/oox/inc/drawingml/table/tablecontext.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/drawingml/shapecontext.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableProperties;
 
@@ -39,7 +39,7 @@ private:
     TableProperties& mrTableProperties;
 };
 
-} } }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/table/tablepartstylecontext.hxx b/oox/inc/drawingml/table/tablepartstylecontext.hxx
index 656648650269..c2f5baadac30 100644
--- a/oox/inc/drawingml/table/tablepartstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablepartstylecontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <drawingml/table/tablestylepart.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TablePartStyleContext final : public ::oox::core::ContextHandler2
 {
@@ -38,7 +38,7 @@ private:
     TableStylePart& mrTableStylePart;
 };
 
-} } }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx
index 6269ee965d83..67a08f49b03e 100644
--- a/oox/inc/drawingml/table/tableproperties.hxx
+++ b/oox/inc/drawingml/table/tableproperties.hxx
@@ -27,7 +27,7 @@
 #include <memory>
 #include <vector>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableProperties
 {
@@ -79,7 +79,7 @@ private:
     bool                                mbBandCol;
 };
 
-} } }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
 
diff --git a/oox/inc/drawingml/table/tablerow.hxx b/oox/inc/drawingml/table/tablerow.hxx
index 1d3a1e2d531b..b344a75cea6c 100644
--- a/oox/inc/drawingml/table/tablerow.hxx
+++ b/oox/inc/drawingml/table/tablerow.hxx
@@ -23,7 +23,7 @@
 #include <drawingml/table/tablecell.hxx>
 #include <vector>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableRow
 {
@@ -41,7 +41,7 @@ private:
     std::vector< TableCell > mvTableCells;
 };
 
-} } }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
 
diff --git a/oox/inc/drawingml/table/tablerowcontext.hxx b/oox/inc/drawingml/table/tablerowcontext.hxx
index 17c7aaeab815..4d5c7348b7bd 100644
--- a/oox/inc/drawingml/table/tablerowcontext.hxx
+++ b/oox/inc/drawingml/table/tablerowcontext.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableRow;
 
@@ -40,7 +40,7 @@ private:
     TableRow& mrTableRow;
 };
 
-} } }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/table/tablestyle.hxx b/oox/inc/drawingml/table/tablestyle.hxx
index 79c867ea4d6d..26c4216a7d3a 100644
--- a/oox/inc/drawingml/table/tablestyle.hxx
+++ b/oox/inc/drawingml/table/tablestyle.hxx
@@ -24,7 +24,7 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/drawingml/shape.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableStyle
 {
@@ -77,7 +77,7 @@ private:
     TableStylePart  maNwCell;
 };
 
-} } }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
 
diff --git a/oox/inc/drawingml/table/tablestylecellstylecontext.hxx b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
index c9877ec2c8d6..404e86a49d87 100644
--- a/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <drawingml/table/tablestylepart.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableStyleCellStyleContext final : public ::oox::core::ContextHandler2
 {
@@ -38,7 +38,7 @@ private:
     sal_Int32                   mnLineType;
 };
 
-} } }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/table/tablestylecontext.hxx b/oox/inc/drawingml/table/tablestylecontext.hxx
index 20b22f12dd13..1ab003496ac9 100644
--- a/oox/inc/drawingml/table/tablestylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestylecontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <drawingml/table/tablestyle.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableStyleContext final : public ::oox::core::ContextHandler2
 {
@@ -39,7 +39,7 @@ private:
     TableStyle& mrTableStyle;
 };
 
-} } }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/table/tablestylelist.hxx b/oox/inc/drawingml/table/tablestylelist.hxx
index bf7243e69cdd..7c0d1e2b1aac 100644
--- a/oox/inc/drawingml/table/tablestylelist.hxx
+++ b/oox/inc/drawingml/table/tablestylelist.hxx
@@ -24,7 +24,7 @@
 #include <memory>
 #include <vector>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableStyle;
 
@@ -47,7 +47,7 @@ private:
 
 typedef std::shared_ptr< TableStyleList > TableStyleListPtr;
 
-} } }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELIST_HXX
 
diff --git a/oox/inc/drawingml/table/tablestylepart.hxx b/oox/inc/drawingml/table/tablestylepart.hxx
index 8f281f70db14..3d1251731855 100644
--- a/oox/inc/drawingml/table/tablestylepart.hxx
+++ b/oox/inc/drawingml/table/tablestylepart.hxx
@@ -27,7 +27,7 @@
 
 #include <map>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableStylePart
 {
@@ -63,7 +63,7 @@ private:
     ::oox::drawingml::ShapeStyleRefMap  maStyleRefs;
 };
 
-} } }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX
 
diff --git a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
index 285b939f754d..7edeef1e8dc2 100644
--- a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <drawingml/table/tablestylepart.hxx>
 
-namespace oox { namespace drawingml { namespace table {
+namespace oox::drawingml::table {
 
 class TableStyleTextStyleContext final : public ::oox::core::ContextHandler2
 {
@@ -39,7 +39,7 @@ private:
     TableStylePart& mrTableStylePart;
 };
 
-} } }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx
index b3edd7392a2c..51016cd2c677 100644
--- a/oox/inc/drawingml/textbody.hxx
+++ b/oox/inc/drawingml/textbody.hxx
@@ -24,14 +24,14 @@
 #include <drawingml/textbodyproperties.hxx>
 #include <drawingml/textliststyle.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace text { class XText; }
     namespace text { class XTextCursor; }
-} } }
+}
 
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextParagraph;
 typedef RefVector< TextParagraph > TextParagraphVector;
@@ -74,7 +74,7 @@ protected:
     TextListStyle       maTextListStyle;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX
 
diff --git a/oox/inc/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx
index cd7e50fa76c5..e164e3520d55 100644
--- a/oox/inc/drawingml/textbodycontext.hxx
+++ b/oox/inc/drawingml/textbodycontext.hxx
@@ -24,7 +24,7 @@
 #include <drawingml/textrun.hxx>
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextBodyContext final : public ::oox::core::ContextHandler2
 {
@@ -54,7 +54,7 @@ private:
     bool                mbIsInText;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/textbodypropertiescontext.hxx b/oox/inc/drawingml/textbodypropertiescontext.hxx
index 7964f1546be6..d10d60d413c6 100644
--- a/oox/inc/drawingml/textbodypropertiescontext.hxx
+++ b/oox/inc/drawingml/textbodypropertiescontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 struct TextBodyProperties;
 
@@ -44,7 +44,7 @@ private:
     ShapePtr mpShapePtr;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/textcharacterpropertiescontext.hxx b/oox/inc/drawingml/textcharacterpropertiescontext.hxx
index fb492a168c68..b2df1b926e3f 100644
--- a/oox/inc/drawingml/textcharacterpropertiescontext.hxx
+++ b/oox/inc/drawingml/textcharacterpropertiescontext.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 struct TextCharacterProperties;
 
@@ -40,7 +40,7 @@ private:
     TextCharacterProperties& mrTextCharacterProperties;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/texteffectscontext.hxx b/oox/inc/drawingml/texteffectscontext.hxx
index 2676121a3c82..9305bccce662 100644
--- a/oox/inc/drawingml/texteffectscontext.hxx
+++ b/oox/inc/drawingml/texteffectscontext.hxx
@@ -18,7 +18,7 @@
 #include <memory>
 #include <vector>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextEffectsContext final : public oox::core::ContextHandler2
 {
@@ -42,7 +42,7 @@ private:
     sal_Int32 mnCurrentElement;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTEFFECTSCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx
index 03bb540df0c7..f365238bd54b 100644
--- a/oox/inc/drawingml/textfield.hxx
+++ b/oox/inc/drawingml/textfield.hxx
@@ -23,7 +23,7 @@
 #include <drawingml/textrun.hxx>
 #include <drawingml/textparagraphproperties.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 struct TextCharacterProperties;
 
@@ -54,7 +54,7 @@ private:
     OUString msUuid;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/textfieldcontext.hxx b/oox/inc/drawingml/textfieldcontext.hxx
index f84ba550cf90..3bb8a3ccd84e 100644
--- a/oox/inc/drawingml/textfieldcontext.hxx
+++ b/oox/inc/drawingml/textfieldcontext.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextField;
 
@@ -43,7 +43,7 @@ private:
     bool mbIsInText;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/inc/drawingml/textfont.hxx b/oox/inc/drawingml/textfont.hxx
index 0b5c7b1aa08d..d2a4b269c666 100644
--- a/oox/inc/drawingml/textfont.hxx
+++ b/oox/inc/drawingml/textfont.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ustring.hxx>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
 namespace oox {
 namespace drawingml {
diff --git a/oox/inc/drawingml/textliststyle.hxx b/oox/inc/drawingml/textliststyle.hxx
index 94b6b10dc569..95f101e0a6c4 100644
--- a/oox/inc/drawingml/textliststyle.hxx
+++ b/oox/inc/drawingml/textliststyle.hxx
@@ -23,7 +23,7 @@
 #include <drawingml/textparagraphproperties.hxx>
 #include <oox/helper/refvector.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 typedef RefVector< TextParagraphProperties > TextParagraphPropertiesVector;
 
@@ -55,7 +55,7 @@ private:
     TextParagraphPropertiesVector maAggregationListStyle;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 
diff --git a/oox/inc/drawingml/textliststylecontext.hxx b/oox/inc/drawingml/textliststylecontext.hxx
index 6f7d1a0d1b77..52b2a08cbc39 100644
--- a/oox/inc/drawingml/textliststylecontext.hxx
+++ b/oox/inc/drawingml/textliststylecontext.hxx
@@ -23,7 +23,7 @@
 #include <drawingml/textliststyle.hxx>
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextListStyleContext final : public ::oox::core::ContextHandler2
 {
@@ -37,7 +37,7 @@ private:
     TextListStyle& mrTextListStyle;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
 
diff --git a/oox/inc/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx
index ec0d57686e1b..22465355142c 100644
--- a/oox/inc/drawingml/textparagraph.hxx
+++ b/oox/inc/drawingml/textparagraph.hxx
@@ -32,11 +32,11 @@
 // The height the bullet is relative to is different in OOXML
 #define OOX_BULLET_LIST_SCALE_FACTOR 0.7f
 
-namespace oox { namespace formulaimport {
+namespace oox::formulaimport {
     class XmlStreamBuilder;
-} }
+}
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 typedef RefVector< TextRun > TextRunVector;
 
@@ -86,7 +86,7 @@ private:
     std::unique_ptr<formulaimport::XmlStreamBuilder> m_pMathXml;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX
 
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx
index 59b8b1d1ff0e..23a177d289f5 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -27,11 +27,11 @@
 #include <drawingml/textspacing.hxx>
 #include <optional>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace graphic { class XGraphic; }
-} } }
+}
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextParagraphProperties;
 
@@ -129,7 +129,7 @@ protected:
     TextSpacing                     maLineSpacing;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
 
diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
index bde6f6dc63ac..33b8493aa228 100644
--- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx
+++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
@@ -26,7 +26,7 @@
 #include <drawingml/textparagraphproperties.hxx>
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextParagraphPropertiesContext final : public ::oox::core::ContextHandler2
 {
@@ -45,7 +45,7 @@ private:
     std::shared_ptr< BlipFillProperties > mxBlipProps;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
 
diff --git a/oox/inc/drawingml/textrun.hxx b/oox/inc/drawingml/textrun.hxx
index 8d3e2c499bc6..355b8a684cc1 100644
--- a/oox/inc/drawingml/textrun.hxx
+++ b/oox/inc/drawingml/textrun.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/text/XText.hpp>
 #include <drawingml/textcharacterproperties.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextRun
 {
@@ -58,7 +58,7 @@ private:
 
 typedef std::shared_ptr< TextRun > TextRunPtr;
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX
 
diff --git a/oox/inc/drawingml/textspacing.hxx b/oox/inc/drawingml/textspacing.hxx
index cfe4da278faf..c40e53fcfa45 100644
--- a/oox/inc/drawingml/textspacing.hxx
+++ b/oox/inc/drawingml/textspacing.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <oox/drawingml/drawingmltypes.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 
     /** carries a CT_TextSpacing */
@@ -65,7 +65,7 @@ namespace oox { namespace drawingml {
         bool      bExactValue;
     };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.hxx b/oox/source/drawingml/diagram/constraintlistcontext.hxx
index dd2132ac2e37..ba3b59355594 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.hxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include "diagramlayoutatoms.hxx"
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class ConstraintListContext : public ::oox::core::ContextHandler2
 {
@@ -36,7 +36,7 @@ private:
     LayoutAtomPtr mpNode;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/diagram/datamodel.hxx b/oox/source/drawingml/diagram/datamodel.hxx
index 4f90f67c25da..aee953b6f30c 100644
--- a/oox/source/drawingml/diagram/datamodel.hxx
+++ b/oox/source/drawingml/diagram/datamodel.hxx
@@ -30,7 +30,7 @@
 #include <oox/token/tokens.hxx>
 #include <svx/DiagramDataInterface.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 namespace dgm {
 
@@ -198,7 +198,7 @@ private:
 
 typedef std::shared_ptr< DiagramData > DiagramDataPtr;
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/diagram/datamodelcontext.hxx b/oox/source/drawingml/diagram/datamodelcontext.hxx
index 7228a8e6122d..4148a01721a4 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.hxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include "datamodel.hxx"
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 // CT_DataModel
 class DataModelContext final : public ::oox::core::ContextHandler2
@@ -38,7 +38,7 @@ private:
     DiagramDataPtr mpDataModel;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DATAMODELCONTEXT_HXX
 
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 576c4007e29f..e3964c76f86c 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -28,11 +28,11 @@
 #include "datamodel.hxx"
 #include <oox/drawingml/shape.hxx>
 
-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 {
+namespace oox::drawingml {
 
 class Diagram;
 class LayoutNode;
@@ -153,7 +153,7 @@ private:
 
 typedef std::shared_ptr< Diagram > DiagramPtr;
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
index 4aea4467bbb0..e92460f5dfb3 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include "diagram.hxx"
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class DiagramDefinitionContext : public ::oox::core::ContextHandler2
 {
@@ -37,7 +37,7 @@ private:
     DiagramLayoutPtr mpLayout;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index 3b5a5cc86ff1..933f1a0fbbac 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -24,7 +24,7 @@
 
 #include "diagram.hxx"
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler2
 {
@@ -96,7 +96,7 @@ private:
     DiagramColorMap&  mrColorsMap;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 35080ea19332..4a24e5071301 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -27,7 +27,7 @@
 
 #include "diagram.hxx"
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class DiagramLayout;
 typedef std::shared_ptr< DiagramLayout > DiagramLayoutPtr;
@@ -290,7 +290,7 @@ private:
 
 typedef std::shared_ptr< ShapeAtom > ShapeAtomPtr;
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/diagram/layoutatomvisitorbase.hxx b/oox/source/drawingml/diagram/layoutatomvisitorbase.hxx
index 4a08c998ca50..ec937fd3559d 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitorbase.hxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitorbase.hxx
@@ -23,7 +23,7 @@
 #include "diagram.hxx"
 #include "diagramlayoutatoms.hxx"
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 struct LayoutAtomVisitor
 {
@@ -89,7 +89,7 @@ private:
     size_t mnCnt;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.hxx b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
index 67a097d8f091..ebb83a28ae27 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.hxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
@@ -25,7 +25,7 @@
 #include "diagramlayoutatoms.hxx"
 #include "layoutatomvisitorbase.hxx"
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class ShapeCreationVisitor : public LayoutAtomVisitorBase
 {
@@ -85,7 +85,7 @@ private:
     std::vector<Constraint> maConstraints;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.hxx b/oox/source/drawingml/diagram/layoutnodecontext.hxx
index 90cbb7140d11..3499f5704579 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.hxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/contexthandler2.hxx>
 #include "diagramlayoutatoms.hxx"
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class LayoutNodeContext : public ::oox::core::ContextHandler2
 {
@@ -36,7 +36,7 @@ private:
     LayoutAtomPtr mpNode;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/source/drawingml/effectpropertiescontext.hxx
index 540dd0187639..ce7b5b3ef363 100644
--- a/oox/source/drawingml/effectpropertiescontext.hxx
+++ b/oox/source/drawingml/effectpropertiescontext.hxx
@@ -12,7 +12,7 @@
 
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 struct EffectProperties;
 struct Effect;
@@ -33,7 +33,7 @@ private:
     EffectProperties& mrEffectProperties;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
 
diff --git a/oox/source/drawingml/textspacingcontext.hxx b/oox/source/drawingml/textspacingcontext.hxx
index ee8ea3b06c18..a5abe50f7bf7 100644
--- a/oox/source/drawingml/textspacingcontext.hxx
+++ b/oox/source/drawingml/textspacingcontext.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextSpacing;
 
@@ -37,7 +37,7 @@ private:
     TextSpacing&        maSpacing;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/drawingml/texttabstoplistcontext.hxx b/oox/source/drawingml/texttabstoplistcontext.hxx
index 2b4537d6e4a8..e1ca2cb11609 100644
--- a/oox/source/drawingml/texttabstoplistcontext.hxx
+++ b/oox/source/drawingml/texttabstoplistcontext.hxx
@@ -26,7 +26,7 @@
 
 #include <oox/core/contexthandler2.hxx>
 
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
 
 class TextTabStopListContext final : public ::oox::core::ContextHandler2
 {
@@ -41,7 +41,7 @@ private:
     ::std::vector< css::style::TabStop >  & maTabList;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/animationtypes.hxx b/oox/source/ppt/animationtypes.hxx
index 195141ef334a..3861456b3e51 100644
--- a/oox/source/ppt/animationtypes.hxx
+++ b/oox/source/ppt/animationtypes.hxx
@@ -22,14 +22,14 @@
 
 #include <com/sun/star/uno/Any.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 // ST_TLTime
 css::uno::Any GetTime( const OUString & val );
 // ST_TLTimeAnimateValueTime
 css::uno::Any GetTimeAnimateValueTime( const OUString & val );
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index 03eac37b92ba..25f7f7dfa9e1 100644
--- a/oox/source/ppt/animvariantcontext.hxx
+++ b/oox/source/ppt/animvariantcontext.hxx
@@ -25,7 +25,7 @@
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/drawingml/color.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     /** context CT_TLAnimVariant */
     class AnimVariantContext
@@ -43,7 +43,7 @@ namespace oox { namespace ppt {
         ::oox::drawingml::Color     maColor;
     };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx
index 097e2ea52b36..a95e464e99dd 100644
--- a/oox/source/ppt/buildlistcontext.hxx
+++ b/oox/source/ppt/buildlistcontext.hxx
@@ -22,7 +22,7 @@
 
 #include <oox/core/fragmenthandler2.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     /** CT_BuildList */
     class BuildListContext
@@ -41,7 +41,7 @@ namespace oox { namespace ppt {
         bool              mbBuildAsOne;
     };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx
index 389f9ce0a0c4..423154b802df 100644
--- a/oox/source/ppt/commonbehaviorcontext.hxx
+++ b/oox/source/ppt/commonbehaviorcontext.hxx
@@ -26,7 +26,7 @@
 #include <oox/ppt/pptfilterhelpers.hxx>
 #include <oox/ppt/timenode.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     struct Attribute
     {
@@ -58,7 +58,7 @@ namespace oox { namespace ppt {
         const TimeNodePtr& mpNode;
     };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index e2f609a8ab94..88695509f7ad 100644
--- a/oox/source/ppt/commontimenodecontext.hxx
+++ b/oox/source/ppt/commontimenodecontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/ppt/timenode.hxx>
 #include <oox/ppt/timenodelistcontext.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     /** CT_TLCommonTimeNodeData */
     class CommonTimeNodeContext
@@ -41,7 +41,7 @@ namespace oox { namespace ppt {
         bool mbIterate;
     };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx
index 75aaf641be16..095dd91ecf06 100644
--- a/oox/source/ppt/conditioncontext.hxx
+++ b/oox/source/ppt/conditioncontext.hxx
@@ -26,7 +26,7 @@
 #include <oox/ppt/timenodelistcontext.hxx>
 #include <oox/ppt/animationspersist.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     /** CT_TLTimeCondition */
     class CondContext
@@ -60,7 +60,7 @@ namespace oox { namespace ppt {
         AnimationConditionList     & maConditions;
     };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index 61c00b92862e..8d73cbacac13 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -13,7 +13,7 @@
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/ppt/slidepersist.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class ExtDrawingFragmentHandler : public ::oox::core::FragmentHandler2
 {
@@ -34,7 +34,7 @@ private:
         oox::drawingml::ShapePtr        mpShapePtr;
 };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/headerfootercontext.hxx b/oox/source/ppt/headerfootercontext.hxx
index 3d9b508b6f6c..9b93fb5f1b7a 100644
--- a/oox/source/ppt/headerfootercontext.hxx
+++ b/oox/source/ppt/headerfootercontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/ppt/headerfooter.hxx>
 #include <oox/core/fragmenthandler2.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     /** CT_HeaderFooter */
     class HeaderFooterContext : public ::oox::core::FragmentHandler2
@@ -35,7 +35,7 @@ namespace oox { namespace ppt {
         virtual ~HeaderFooterContext( ) override;
     };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx
index 5f9d7a465ad2..34b1c54326eb 100644
--- a/oox/source/ppt/timeanimvaluecontext.hxx
+++ b/oox/source/ppt/timeanimvaluecontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/ppt/animationspersist.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     /** CT_TLTimeAnimateValueList */
     class TimeAnimValueListContext
@@ -44,7 +44,7 @@ namespace oox { namespace ppt {
         bool                     mbInValue;
     };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx
index b9cc1d4aa98e..db75f6908baa 100644
--- a/oox/source/ppt/timetargetelementcontext.hxx
+++ b/oox/source/ppt/timetargetelementcontext.hxx
@@ -23,7 +23,7 @@
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/ppt/animationspersist.hxx>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     /** context CT_TLTimeTargetElement */
     class TimeTargetElementContext
@@ -38,7 +38,7 @@ namespace oox { namespace ppt {
         AnimTargetElementPtr mpTarget;
     };
 
-} }
+}
 
 #endif
 
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index c97714c8ac8f..abda9c94a913 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
-namespace oox { namespace shape {
+namespace oox::shape {
 
 class ShapeFragmentHandler : public core::FragmentHandler2
 {
@@ -157,7 +157,7 @@ private:
     css::uno::Reference<XFastContextHandler> getContextHandler(sal_Int32 nElement = 0);
 };
 
-}}
+}
 
 #endif // INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
 
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index 7675a3be67a8..53ce4d1293ba 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -13,7 +13,7 @@
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 
-namespace oox { namespace shape {
+namespace oox::shape {
 
 /// Generic (i.e. not specific to PPTX) handler for the prerendered diagram parsing.
 class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2
@@ -28,7 +28,7 @@ private:
         oox::drawingml::ShapePtr        mpGroupShapePtr;
 };
 
-} }
+}
 
 #endif