6 files changed, 19 insertions, 21 deletions
diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx
index f90c49cf5537..4fab5a9e596b 100644
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -40,18 +40,18 @@ namespace basegfx
     class B2DPolyPolygon;
 };
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
 {
     struct IntegerRectangle2D;
     struct RealPoint2D;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     class  XBitmap;
     class  XPolyPolygon2D;
     class  XCanvasFont;
-} } } }
+}
 
 
 namespace dxcanvas
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx
index 897d7eb1c727..0448c39aa8d0 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.hxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx
@@ -31,9 +31,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/vector/b2isize.hxx>
 
-namespace com { namespace sun { namespace star { namespace rendering {
-    class XCanvasFont;
-} } } }
+namespace com::sun::star::rendering { class XCanvasFont; }
 
 namespace Gdiplus { class Graphics; }
 
diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx
index 878b586f9c9e..1ee15a9ba989 100644
--- a/canvas/source/opengl/ogl_canvastools.hxx
+++ b/canvas/source/opengl/ogl_canvastools.hxx
@@ -15,9 +15,9 @@
 
 #include <epoxy/gl.h>
 
-namespace com { namespace sun { namespace star { namespace rendering {
+namespace com::sun::star::rendering {
     struct ARGBColor;
-}}}}
+}
 namespace basegfx {
     class B2DPolyPolygon;
     class B2DHomMatrix;
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index 4d3664db6eb4..a4dd4d77e095 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -23,10 +23,10 @@
 namespace vcl { class Window; }
 class SystemChildWindow;
 namespace basegfx{ class B2IVector; class B2DHomMatrix; }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Rectangle; }
     namespace geometry { struct AffineMatrix2D; }
-}}}
+}
 
 namespace oglcanvas
 {
diff --git a/canvas/source/opengl/ogl_texturecache.hxx b/canvas/source/opengl/ogl_texturecache.hxx
index 4a8a8de25e64..adef65760e27 100644
--- a/canvas/source/opengl/ogl_texturecache.hxx
+++ b/canvas/source/opengl/ogl_texturecache.hxx
@@ -13,9 +13,9 @@
 #include <sal/types.h>
 #include <unordered_map>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace geometry { struct IntegerSize2D; }
-}}}
+}
 
 namespace oglcanvas
 {
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index db74b533a7d6..eb4918c68459 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -44,31 +44,31 @@ namespace basegfx
     }
 }
 
-namespace com { namespace sun { namespace star { namespace awt
+namespace com::sun::star::awt
 {
     struct Point;
     struct Size;
     struct Rectangle;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace drawing
+namespace com::sun::star::drawing
 {
     struct HomogenMatrix3;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
 {
     struct RealPoint2D;
     struct RealSize2D;
     struct RealRectangle2D;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
 {
     struct RenderState;
     struct ViewState;
     class  XBitmap;
-} } } }
+}
 
 
 namespace vclcanvas