15 files changed, 28 insertions, 68 deletions
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index c85e3720dbd9..e1e54664f815 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -71,15 +71,9 @@ class SvxForbiddenCharactersTable;
 class SvtCTLOptions;
 namespace vcl { class Window; }
 class SvxNumberFormat;
-
-
-namespace com {
-namespace sun {
-namespace star {
-namespace datatransfer {
-namespace clipboard {
+namespace com::sun::star::datatransfer::clipboard {
     class XClipboard;
-}}}}}
+}
 
 namespace editeng {
     struct MisspellRanges;
diff --git a/extensions/source/propctrlr/controltype.hxx b/extensions/source/propctrlr/controltype.hxx
index 721de7b8c024..d3bf9cce0b98 100644
--- a/extensions/source/propctrlr/controltype.hxx
+++ b/extensions/source/propctrlr/controltype.hxx
@@ -22,20 +22,15 @@
 #include <sal/types.h>
 
 
-namespace pcr
+namespace pcr::ControlType
 {
-
-    namespace ControlType
-    {
         const sal_Int16 FIXEDLINE      = sal_Int16(100);
         const sal_Int16 FORMATTEDFIELD = sal_Int16(101);
         const sal_Int16 PROGRESSBAR    = sal_Int16(102);
 
         // need only those which are not already covered as FormComponentType
-    }
-
 
-} // namespacepcr
+} // namespace pcr::ControlType
 
 
 #endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CONTROLTYPE_HXX
diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index 8cead06c302d..7ba811ccc060 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.hxx
@@ -34,8 +34,7 @@
 #include <rtl/ustring.hxx>
 
 
-namespace filter{
-    namespace config{
+namespace filter::config {
 
 
 /** @short      implements the interface css::container::XNameContainer
@@ -257,8 +256,7 @@ class BaseContainer : public BaseLock
         virtual void SAL_CALL removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) override;
 };
 
-    } // namespace config
-} // namespace filter
+} // namespace filter::config
 
 #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_BASECONTAINER_HXX
 
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index ed359bdab893..aeaaf3a83afb 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -28,8 +28,7 @@
 #include <osl/mutex.hxx>
 
 
-namespace filter{
-    namespace config{
+namespace filter::config {
 
 
 /** @short  Must be used as first derived base class
@@ -188,8 +187,7 @@ struct FlatDetectionInfo
 
 typedef ::std::vector< FlatDetectionInfo > FlatDetection;
 
-    } // namespace config
-} // namespace filter
+} // namespace filter::config
 
 #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX
 
diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx
index 2ac4f9f3beb9..714e4016ba51 100644
--- a/filter/source/config/cache/cacheupdatelistener.hxx
+++ b/filter/source/config/cache/cacheupdatelistener.hxx
@@ -24,8 +24,7 @@
 #include <cppuhelper/implbase.hxx>
 
 
-namespace filter{
-    namespace config{
+namespace filter::config {
 
 
 /** @short      implements a listener, which will update the
@@ -108,8 +107,7 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 };
 
-    } // namespace config
-} // namespace filter
+} // namespace filter::config
 
 #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEUPDATELISTENER_HXX
 
diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx
index 5b2e2a31d270..179d59d74ff6 100644
--- a/filter/source/config/cache/configflush.hxx
+++ b/filter/source/config/cache/configflush.hxx
@@ -27,8 +27,7 @@
 #include <cppuhelper/implbase.hxx>
 
 
-namespace filter{
-    namespace config{
+namespace filter::config {
 
 
 /** @short      supports registration of XRefreshListener
@@ -93,8 +92,7 @@ class ConfigFlush final : public BaseLock
         static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
 };
 
-    } // namespace config
-} // namespace filter
+} // namespace filter::config
 
 #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONFIGFLUSH_HXX
 
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx
index 9836ad003f6b..bc6f17ba4b45 100644
--- a/filter/source/config/cache/contenthandlerfactory.hxx
+++ b/filter/source/config/cache/contenthandlerfactory.hxx
@@ -25,8 +25,7 @@
 #include <cppuhelper/implbase.hxx>
 
 
-namespace filter{
-    namespace config{
+namespace filter::config {
 
 
 /** @short      implements the service <type scope="com.sun.star.document">ContentHandlerFactory</type>.
@@ -96,8 +95,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine
 
 };
 
-    } // namespace config
-} // namespace filter
+} // namespace filter::config
 
 #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONTENTHANDLERFACTORY_HXX
 
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 6b99a0781f0c..243c192a8072 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -35,8 +35,7 @@
 #include <rtl/ustring.hxx>
 
 
-namespace filter{
-    namespace config{
+namespace filter::config {
 
 class CacheUpdateListener;
 
@@ -937,8 +936,7 @@ class FilterCache : public BaseLock
 
 struct TheFilterCache: public rtl::Static<FilterCache, TheFilterCache> {};
 
-    } // namespace config
-} // namespace filter
+} // namespace filter::config
 
 #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FILTERCACHE_HXX
 
diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx
index 93588762797e..77d1b426d08e 100644
--- a/filter/source/config/cache/filterfactory.hxx
+++ b/filter/source/config/cache/filterfactory.hxx
@@ -26,8 +26,7 @@
 #include <cppuhelper/implbase.hxx>
 
 
-namespace filter{
-    namespace config{
+namespace filter::config {
 
 
 /** @short      implements the service <type scope="com.sun.star.document">FilterFactory</type>.
@@ -132,8 +131,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
 
 };
 
-    } // namespace config
-} // namespace filter
+} // namespace filter::config
 
 #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FILTERFACTORY_HXX
 
diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx
index 1c2d9cc2822e..a1aa859e1555 100644
--- a/filter/source/config/cache/frameloaderfactory.hxx
+++ b/filter/source/config/cache/frameloaderfactory.hxx
@@ -25,8 +25,7 @@
 #include <cppuhelper/implbase.hxx>
 
 
-namespace filter{
-    namespace config{
+namespace filter::config {
 
 
 /** @short      implements the service <type scope="com.sun.star.document">FrameLoaderFactory</type>.
@@ -95,8 +94,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
 
 };
 
-    } // namespace config
-} // namespace filter
+} // namespace filter::config
 
 #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FRAMELOADERFACTORY_HXX
 
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index ca9cf09880bc..f5dbf7623650 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -24,8 +24,7 @@
 #include <unordered_map>
 
 
-namespace filter{
-    namespace config{
+namespace filter::config {
 
 
 /** @short      It can be used to split any query string (which can be used at the
@@ -89,8 +88,7 @@ class QueryTokenizer : public std::unordered_map< OUString, OUString >
         bool valid() const;
 };
 
-    } // namespace config
-} // namespace filter
+} // namespace filter::config
 
 #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX
 
diff --git a/include/editeng/forbiddencharacterstable.hxx b/include/editeng/forbiddencharacterstable.hxx
index dff3309591a2..923f1886ae4f 100644
--- a/include/editeng/forbiddencharacterstable.hxx
+++ b/include/editeng/forbiddencharacterstable.hxx
@@ -27,12 +27,7 @@
 #include <map>
 #include <memory>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace uno {
-    class XComponentContext;
-}}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable
 {
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 0693e71a265f..7bc7483b660c 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -39,8 +39,7 @@ namespace com::sun::star {
 
 class SfxObjectShell;
 
-namespace ooo {
-namespace vba {
+namespace ooo::vba {
 
 
 struct MSFILTER_DLLPUBLIC MacroResolvedInfo
@@ -106,8 +105,7 @@ private:
 };
 
 
-} // namespace vba
-} // namespace ooo
+} // namespace ooo::vba
 
 #endif
 
diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx
index ffc0d9ee779d..fd7473149df6 100644
--- a/include/filter/msfilter/rtfutil.hxx
+++ b/include/filter/msfilter/rtfutil.hxx
@@ -22,9 +22,7 @@
 
 class SvStream;
 
-namespace msfilter
-{
-namespace rtfutil
+namespace msfilter::rtfutil
 {
 /// Outputs a single character in hex form.
 MSFILTER_DLLPUBLIC OString OutHex(sal_uLong nHex, sal_uInt8 nLen);
@@ -74,7 +72,6 @@ MSFILTER_DLLPUBLIC bool ExtractOLE2FromObjdata(const OString& rObjdata, SvStream
 /// Strips the header of a WMF file.
 MSFILTER_DLLPUBLIC bool StripMetafileHeader(const sal_uInt8*& rpGraphicAry, sal_uInt64& rSize);
 }
-}
 
 #endif
 
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index 5ce3b2a2159c..ea72d72b3d20 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -25,8 +25,7 @@ namespace com::sun::star {
     namespace lang { struct Locale; }
 }
 
-namespace msfilter {
-namespace util {
+namespace msfilter::util {
 
 /// Returns the best-fit default 8bit encoding for a given locale
 /// i.e. useful when dealing with legacy formats which use legacy text encodings without recording
@@ -137,7 +136,7 @@ MSFILTER_DLLPUBLIC sal_uInt8 TransColToIco( const Color& rCol );
 
 }
 
-}
+
 
 #endif