compact namespace: cppcanvas

Change-Id: I53826803bd7749b7fead5e464e2dc65212d5bb9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98908
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 13 insertions, 38 deletions

diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.hxx b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
index a0dcdbec3fc3..59bf841dabc0 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.hxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
@@ -30,10 +30,8 @@ class BitmapEx;
 
 /* Definition of internal::BitmapActionFactory */
 
-namespace cppcanvas
+namespace cppcanvas::internal
 {
-    namespace internal
-    {
         struct OutDevState;
 
         /** Creates encapsulated converters between GDIMetaFile and
@@ -58,7 +56,6 @@ namespace cppcanvas
                                                        const CanvasSharedPtr&,
                                                        const OutDevState& );
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 3f0c5302d178..2f32d887b515 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -32,9 +32,7 @@ namespace basegfx { class B2DHomMatrix; }
 
 /* Definition of internal::CachedPrimitiveBase class */
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         /** Base class providing cached re-rendering, if XCanvas
             returns XCachedPrimitive
@@ -79,7 +77,7 @@ namespace cppcanvas
             mutable ::basegfx::B2DHomMatrix                                 maLastTransformation;
             const bool                                                      mbOnlyRedrawWithSameTransform;
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/lineaction.hxx b/cppcanvas/source/mtfrenderer/lineaction.hxx
index ec510bd2bd76..2b2913cfc002 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.hxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.hxx
@@ -29,9 +29,7 @@ namespace basegfx {
 
 /* Definition of internal::LineActionFactory */
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         struct OutDevState;
 
@@ -50,7 +48,7 @@ namespace cppcanvas
                                                      const CanvasSharedPtr&,
                                                      const OutDevState& );
         }
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/pointaction.hxx b/cppcanvas/source/mtfrenderer/pointaction.hxx
index f6483cdee448..d51ccb5dda49 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.hxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.hxx
@@ -29,9 +29,7 @@ namespace basegfx {
 
 /* Definition of internal::PointActionFactory */
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         struct OutDevState;
 
@@ -55,7 +53,7 @@ namespace cppcanvas
                                                       const OutDevState&,
                                                       const ::Color&        );
         }
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index 6c18e06ea82b..2ddfd55b4ba9 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -35,9 +35,7 @@ namespace com::sun::star::rendering
 
 /* Definition of internal::PolyPolyActionFactory */
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         struct OutDevState;
 
@@ -78,7 +76,7 @@ namespace cppcanvas
                                                   const OutDevState&,
                                                   int nTransparency );
         }
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index 8bd8bb85afda..2023aeec74ea 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -31,9 +31,7 @@ class Color;
 
 /* Definition of internal::TextActionFactory */
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         struct OutDevState;
 
@@ -76,7 +74,6 @@ namespace cppcanvas
                                                      const Renderer::Parameters&    rParms,
                                                      bool                           bSubsettable );
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textlineshelper.hxx b/cppcanvas/source/mtfrenderer/textlineshelper.hxx
index aae63023298f..38105961ee05 100644
--- a/cppcanvas/source/mtfrenderer/textlineshelper.hxx
+++ b/cppcanvas/source/mtfrenderer/textlineshelper.hxx
@@ -15,19 +15,10 @@
 #include <basegfx/vector/b2dsize.hxx>
 #include <cppcanvas/canvas.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace rendering
+namespace com::sun::star::rendering
 {
 class XPolyPolygon2D;
 }
-}
-}
-}
 
 namespace cppcanvas
 {
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index 5b428e07b6ba..f863d18ed4c7 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
@@ -35,9 +35,7 @@ class Gradient;
 
 /* Definition of internal::TransparencyGroupActionFactory */
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         struct OutDevState;
 
@@ -84,7 +82,7 @@ namespace cppcanvas
                                                                   const CanvasSharedPtr&        rCanvas,
                                                                   const OutDevState&            rState );
         }
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */