10 files changed, 19 insertions, 42 deletions
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index 6213d61f2e29..d6531da3a8d3 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -27,9 +27,7 @@
 
 #include <memory>
 
-namespace basegfx
-{
-    namespace internal
+namespace basegfx::internal
     {
 
         inline double implGetDefaultValue(sal_uInt16 nRow, sal_uInt16 nColumn)
@@ -523,8 +521,7 @@ namespace basegfx
             }
         };
 
-    } // namespace internal
-} // namespace basegfx
+} // namespace basegfx::internal
 
 #endif // INCLUDED_BASEGFX_SOURCE_INC_HOMMATRIXTEMPLATE_HXX
 
diff --git a/basegfx/source/inc/stringconversiontools.hxx b/basegfx/source/inc/stringconversiontools.hxx
index ed554a1efcdf..f50d33bdb90a 100644
--- a/basegfx/source/inc/stringconversiontools.hxx
+++ b/basegfx/source/inc/stringconversiontools.hxx
@@ -22,9 +22,7 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-namespace basegfx
-{
-    namespace internal
+namespace basegfx::internal
     {
         void skipSpaces(sal_Int32&      io_rPos,
                         const OUString& rStr,
@@ -57,8 +55,7 @@ namespace basegfx
                                  const OUString& rStr,
                                  const sal_Int32 nLen);
 
-    } // namespace internal
-} // namespace basegfx
+} // namespace basegfx::internal
 
 #endif // INCLUDED_BASEGFX_SOURCE_INC_STRINGCONVERSIONTOOLS_HXX
 
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index 21778b4843fb..413af7556643 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -52,10 +52,8 @@
 using namespace ::com::sun::star;
 
 
-namespace dxcanvas
+namespace dxcanvas::tools
 {
-    namespace tools
-    {
         ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( const uno::Reference< rendering::XPolyPolygon2D >& xPoly )
         {
             LinePolyPolygon* pPolyImpl = dynamic_cast< LinePolyPolygon* >( xPoly.get() );
@@ -627,7 +625,6 @@ namespace dxcanvas
             o_rAttr.SetColorMatrix( &aColorMatrix );
         }
 
-    } // namespace tools
-} // namespace dxcanvas
+} // namespace dxcanvas::tools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx
index 4fab5a9e596b..f4f5a98ddfaa 100644
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -54,10 +54,8 @@ namespace com::sun::star::rendering
 }
 
 
-namespace dxcanvas
+namespace dxcanvas::tools
 {
-    namespace tools
-    {
         struct RawRGBABitmap;
 
         ::basegfx::B2DPolyPolygon
@@ -121,9 +119,9 @@ namespace dxcanvas
                                          double                           nGreenModulation,
                                          double                           nBlueModulation,
                                          double                           nAlphaModulation );
-    }
 }
 
+
 #endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index 287ed7beda54..b7eb0570e48a 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -33,10 +33,8 @@
 
 using namespace ::com::sun::star;
 
-namespace dxcanvas
+namespace dxcanvas::tools
 {
-    namespace tools
-    {
         namespace
         {
             /// Calc number of colors in given BitmapInfoHeader
@@ -462,7 +460,7 @@ namespace dxcanvas
 
             return drawVCLBitmapEx( rGraphics, aBmpEx );
         }
-    }
 }
 
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx
index 8eb5ea90b2a4..c3bd9bd28ff6 100644
--- a/canvas/source/directx/dx_vcltools.hxx
+++ b/canvas/source/directx/dx_vcltools.hxx
@@ -26,10 +26,8 @@
 
 namespace Gdiplus { class Graphics; }
 
-namespace dxcanvas
+namespace dxcanvas::tools
 {
-    namespace tools
-    {
         /** Raw RGBA bitmap data,
             contiguous in memory
         */
@@ -43,9 +41,9 @@ namespace dxcanvas
         bool drawVCLBitmapFromXBitmap( const std::shared_ptr< Gdiplus::Graphics >& rGraphics,
                                        const css::uno::Reference<
                                              css::rendering::XBitmap >&   xBitmap );
-    }
 }
 
+
 #endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index a4dd4d77e095..d5f3cb714548 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -23,10 +23,9 @@
 namespace vcl { class Window; }
 class SystemChildWindow;
 namespace basegfx{ class B2IVector; class B2DHomMatrix; }
-namespace com::sun::star {
-    namespace awt { struct Rectangle; }
-    namespace geometry { struct AffineMatrix2D; }
-}
+namespace com::sun::star::awt { struct Rectangle; }
+namespace com::sun::star::geometry { struct AffineMatrix2D; }
+
 
 namespace oglcanvas
 {
diff --git a/canvas/source/opengl/ogl_texturecache.hxx b/canvas/source/opengl/ogl_texturecache.hxx
index adef65760e27..848b2e900abf 100644
--- a/canvas/source/opengl/ogl_texturecache.hxx
+++ b/canvas/source/opengl/ogl_texturecache.hxx
@@ -13,9 +13,8 @@
 #include <sal/types.h>
 #include <unordered_map>
 
-namespace com::sun::star {
-    namespace geometry { struct IntegerSize2D; }
-}
+namespace com::sun::star::geometry { struct IntegerSize2D; }
+
 
 namespace oglcanvas
 {
diff --git a/include/basegfx/range/b2drangeclipper.hxx b/include/basegfx/range/b2drangeclipper.hxx
index 63e8f05c2fc9..6ea0a3f0e2d9 100644
--- a/include/basegfx/range/b2drangeclipper.hxx
+++ b/include/basegfx/range/b2drangeclipper.hxx
@@ -23,10 +23,8 @@
 #include <vector>
 #include <basegfx/basegfxdllapi.h>
 
-namespace basegfx
+namespace basegfx::utils
 {
-    namespace utils
-    {
         /** Extract poly-polygon w/o self-intersections from poly-range
 
             Similar to the solveCrossovers(const B2DPolyPolygon&)
@@ -36,7 +34,6 @@ namespace basegfx
          */
         BASEGFX_DLLPUBLIC B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges,
                                        const std::vector<B2VectorOrientation>& rOrientations);
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/elapsedtime.hxx b/include/canvas/elapsedtime.hxx
index 9fb8bb5dea79..7519b024c87f 100644
--- a/include/canvas/elapsedtime.hxx
+++ b/include/canvas/elapsedtime.hxx
@@ -23,10 +23,8 @@
 #include <canvas/canvastoolsdllapi.h>
 #include <memory>
 
-namespace canvas
+namespace canvas::tools
 {
-    namespace tools
-    {
         /** Calculate elapsed time.
 
             This class provides several time-measurement and
@@ -158,7 +156,6 @@ namespace canvas
             bool                                    m_bInHoldMode;
         };
 
-    }
 }
 
 #endif /* INCLUDED_CANVAS_ELAPSEDTIME_HXX */