5 files changed, 7 insertions, 14 deletions
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 388e33d60e01..14ed004f4028 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -74,9 +74,7 @@ sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& N
 
 } // anonymous namespace
 
-namespace xmloff
-{
-namespace chart
+namespace xmloff::chart
 {
 
 ColorPropertySet::ColorPropertySet( sal_Int32 nColor ) :
@@ -154,7 +152,6 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropert
     return uno::Any();
 }
 
-} //  namespace chart
-} //  namespace xmloff
+} //  namespace xmloff::chart
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index bbd9aa3fcf7c..96115303c31b 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -22,7 +22,7 @@
 #include <rtl/ustring.hxx>
 
 
-namespace xmloff { namespace token {
+namespace xmloff::token {
 
     // keep the tokens (and their length)
     namespace
@@ -3433,6 +3433,5 @@ namespace xmloff { namespace token {
         return aIter.isString( pToken->pChar );
     }
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 3abca04a50db..22e88df0ced6 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -22,7 +22,7 @@
 #include <unordered_map>
 #include <memory>
 
-namespace xmloff { namespace EnhancedCustomShapeToken {
+namespace xmloff::EnhancedCustomShapeToken {
 
 typedef std::unordered_map< const char*, EnhancedCustomShapeTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
 static TypeNameHashMap* pHashMap = nullptr;
@@ -205,6 +205,5 @@ OUString EASGet( const EnhancedCustomShapeTokenEnum eToken )
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index 9f99426091e9..5908f1396b9a 100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -31,7 +31,7 @@
 
 #include <unordered_map>
 
-namespace xmloff { namespace metadata
+namespace xmloff::metadata
 {
 
     using namespace ::xmloff::token;
@@ -171,6 +171,6 @@ namespace xmloff { namespace metadata
         return attribute;
     }
 
-} } // namespace xmloff::metadata
+} // namespace xmloff::metadata
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
index a9a22991eac7..db928cde972c 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
@@ -24,9 +24,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <osl/diagnose.h>
 
-namespace com { namespace sun { namespace star {
-    namespace beans { class XPropertySet; }
-} } }
+namespace com::sun::star::beans { class XPropertySet; }
 
 using namespace ::com::sun::star::uno;
 using ::com::sun::star::beans::XPropertySet;