11 files changed, 19 insertions, 34 deletions
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index 93b401bf9ed0..c0827dd92a24 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -29,8 +29,7 @@
 #include <comphelper/processfactory.hxx>
 #include <rtl/instance.hxx>
 
-namespace basic {
-namespace vba {
+namespace basic::vba {
 
 using namespace ::com::sun::star;
 
@@ -183,7 +182,6 @@ void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, c
 }
 
 
-} // namespace vba
 } // namespace basic
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 80cae5ad699b..496702120ab4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -300,7 +300,7 @@ static void cpp_call(
 }
 
 
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
 
 void unoInterfaceProxyDispatch(
     uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
@@ -432,6 +432,6 @@ void unoInterfaceProxyDispatch(
     }
 }
 
-} } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx
index 186d89aa1956..007373448bb3 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -31,7 +31,7 @@
 #include <uno/environment.h>
 #include <uno/mapping.h>
 
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
 
 void freeMapping(uno_Mapping * pMapping)
 {
@@ -205,6 +205,6 @@ Bridge::~Bridge()
     (*pCppEnv->aBase.release)( &pCppEnv->aBase );
 }
 
-} } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 29b035fec3ab..e4ee7800a385 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -29,7 +29,7 @@
 #include <memory>
 #include <new>
 
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
 
 void freeCppInterfaceProxy(uno_ExtEnvironment * pEnv, void * pInterface)
 {
@@ -138,6 +138,6 @@ CppInterfaceProxy * CppInterfaceProxy::castInterfaceToProxy(void * pInterface)
         static_cast< char * >(pInterface) - offset);
 }
 
-} } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/types.cxx b/bridges/source/cpp_uno/shared/types.cxx
index a22e3307173f..61dc3dabec88 100644
--- a/bridges/source/cpp_uno/shared/types.cxx
+++ b/bridges/source/cpp_uno/shared/types.cxx
@@ -23,7 +23,7 @@
 #include <typelib/typeclass.h>
 #include <typelib/typedescription.h>
 
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
 
 bool isSimpleType(typelib_TypeClass typeClass) {
     return typeClass <= typelib_TypeClass_DOUBLE
@@ -112,6 +112,6 @@ bool relatesToInterfaceType(typelib_TypeDescription const * type) {
     return false;
 }
 
-} } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index 42037afe6e54..c3c560acb7de 100644
--- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
@@ -25,7 +25,7 @@
 #include <typelib/typedescription.h>
 #include <uno/dispatcher.h>
 
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
 
 void freeUnoInterfaceProxy(uno_ExtEnvironment * pEnv, void * pProxy)
 {
@@ -120,6 +120,6 @@ UnoInterfaceProxy::UnoInterfaceProxy(
 UnoInterfaceProxy::~UnoInterfaceProxy()
 {}
 
-} } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/vtables.cxx b/bridges/source/cpp_uno/shared/vtables.cxx
index a9909eaee5ca..beda5ad29d44 100644
--- a/bridges/source/cpp_uno/shared/vtables.cxx
+++ b/bridges/source/cpp_uno/shared/vtables.cxx
@@ -109,7 +109,7 @@ template< typename T > bridges::cpp_uno::shared::VtableSlot doGetVtableSlot(
 
 }
 
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
 
 sal_Int32 getLocalFunctions(typelib_InterfaceTypeDescription const * type) {
     return type->nMembers == 0
@@ -141,6 +141,6 @@ VtableSlot getVtableSlot(
     return doGetVtableSlot(ifcMember);
 }
 
-} } }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index d8507fb1e29a..c9e4c71284a6 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -62,9 +62,7 @@
 
 using namespace ::com::sun::star;
 
-namespace canvas
-{
-    namespace tools
+namespace canvas::tools
     {
         geometry::RealSize2D createInfiniteSize2D()
         {
@@ -1319,8 +1317,6 @@ namespace canvas
             }
         }
 
-    } // namespace tools
-
-} // namespace canvas
+    } // namespace canvas
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index 28e1a660f2a1..a73ffc5936dc 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -23,8 +23,7 @@
 
 #include <tools/time.hxx>
 
-namespace canvas {
-namespace tools {
+namespace canvas::tools {
 
 double ElapsedTime::getSystemTime()
 {
@@ -125,7 +124,6 @@ void ElapsedTime::releaseTimer()
     m_bInHoldMode = false;
 }
 
-} // namespace tools
 } // namespace canvas
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx
index 7ca81c054330..fab7e13b684b 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.cxx
@@ -46,9 +46,7 @@
 
 using namespace ::com::sun::star;
 
-namespace canvas
-{
-    namespace tools
+namespace canvas::tools
     {
         void verifyInput( const geometry::RealPoint2D&              rPoint,
                           const char*                               pStr,
@@ -710,8 +708,6 @@ namespace canvas
         }
 
 
-    } // namespace tools
-
-} // namespace canvas
+    } // namespace canvas
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 8b908c5a63bf..c1e913b99fe4 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -43,9 +43,7 @@
 
 using namespace ::com::sun::star;
 
-namespace vclcanvas
-{
-    namespace tools
+namespace vclcanvas::tools
     {
         ::BitmapEx bitmapExFromXBitmap( const uno::Reference< rendering::XBitmap >& xBitmap )
         {
@@ -219,6 +217,5 @@ namespace vclcanvas
             return vcl::bitmap::CanvasTransformBitmap(rBitmap, rTransform, aDestRect, aLocalTransform);
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */