4 files changed, 8 insertions, 17 deletions
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: */