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>

20 files changed, 28 insertions, 90 deletions

diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index bf122292a2fd..082e6d43f523 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -30,9 +30,7 @@ namespace basegfx
 
 /* Definition of Action interface */
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         /** Interface for internal render actions
 
@@ -142,7 +140,6 @@ namespace cppcanvas
              */
             virtual sal_Int32 getActionCount() const = 0;
         };
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index f003ec977d8e..0716199ddbeb 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -35,10 +35,7 @@ namespace com::sun::star::rendering
 
 /* Definition of CanvasGraphicHelper class */
 
-namespace cppcanvas
-{
-
-    namespace internal
+namespace cppcanvas::internal
     {
 
         class CanvasGraphicHelper : public virtual CanvasGraphic
@@ -65,7 +62,6 @@ namespace cppcanvas
             CanvasSharedPtr                                                       mpCanvas;
         };
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 6c260c3f3ecd..81702c332d0b 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -50,10 +50,7 @@ namespace basegfx {
     class B2DPolygon;
 }
 
-namespace cppcanvas
-{
-
-    namespace internal
+namespace cppcanvas::internal
     {
         struct OutDevState;
         struct ActionFactoryParameters;
@@ -241,7 +238,7 @@ namespace cppcanvas
             const Renderer::Parameters& mrParms;
             sal_Int32&                  mrCurrActionIndex;
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx
index 590a7b2ec674..16cc3c4ff25a 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -33,9 +33,7 @@
 #include <vcl/outdevstate.hxx>
 
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         struct OutDevState
         {
@@ -120,7 +118,7 @@ namespace cppcanvas
             bool                                                                     isTextOverlineColorSet;
             bool                                                                     isTextLineColorSet;
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index fab00805a93e..dadd1b3a0b93 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -22,14 +22,11 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppcanvas/color.hxx>
 
-namespace cppcanvas
-{
-    namespace tools
+namespace cppcanvas::tools
     {
         css::uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA );
 
         IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Sequence< double >& rColor  );
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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: */
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index aa8677501dab..93ec7daf4727 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -29,11 +29,8 @@
 
 /*Definition of ImplBitmap */
 
-namespace cppcanvas
+namespace cppcanvas::internal
 {
-
-    namespace internal
-    {
         // share partial CanvasGraphic implementation from CanvasGraphicHelper
         class ImplBitmap : public virtual ::cppcanvas::Bitmap, protected CanvasGraphicHelper
         {
@@ -60,7 +57,7 @@ namespace cppcanvas
             const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
             BitmapCanvasSharedPtr                                mpBitmapCanvas;
          };
-    }
+
 }
 
 #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index afac7b9a8a65..17912a04efe9 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -27,10 +27,8 @@
 #include "implcanvas.hxx"
 
 
-namespace cppcanvas
+namespace cppcanvas::internal
 {
-    namespace internal
-    {
         // share Canvas implementation from ImplCanvas
         class ImplBitmapCanvas : public virtual BitmapCanvas, protected virtual ImplCanvas
         {
@@ -51,7 +49,6 @@ namespace cppcanvas
             const css::uno::Reference< css::rendering::XBitmapCanvas >    mxBitmapCanvas;
             const css::uno::Reference< css::rendering::XBitmap >          mxBitmap;
         };
-    }
 }
 
 #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 2d20f4a6036c..35fded39a1d6 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -42,12 +42,9 @@ namespace com::sun::star::rendering
 
 /* Definition of ImplCanvas */
 
-namespace cppcanvas
+namespace cppcanvas::internal
 {
 
-    namespace internal
-    {
-
         class ImplCanvas : public virtual Canvas
         {
         public:
@@ -81,7 +78,6 @@ namespace cppcanvas
             const css::uno::Reference< css::rendering::XCanvas > mxCanvas;
         };
 
-    }
 }
 
 #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index 0235e0a43803..87ae338568c2 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -25,10 +25,8 @@
 #include "implsprite.hxx"
 #include "implspritecanvas.hxx"
 
-namespace cppcanvas
+namespace cppcanvas::internal
 {
-    namespace internal
-    {
         // share Sprite implementation of ImplSprite
         class ImplCustomSprite : public virtual CustomSprite, protected virtual ImplSprite
         {
@@ -49,7 +47,6 @@ namespace cppcanvas
             mutable CanvasSharedPtr                                    mpLastCanvas;
             const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite;
         };
-    }
 }
 
 #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index ab924373ff9d..7cf20feefd4c 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -33,10 +33,8 @@ namespace com::sun::star::rendering
 }
 
 
-namespace cppcanvas
+namespace cppcanvas::internal
 {
-    namespace internal
-    {
 
         class ImplPolyPolygon : public virtual ::cppcanvas::PolyPolygon, protected CanvasGraphicHelper
         {
@@ -73,7 +71,6 @@ namespace cppcanvas
             bool                                                        mbStrokeColorSet;
         };
 
-    }
 }
 
 #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index aad786d4ccc8..ebc3d0b46859 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -26,10 +26,8 @@
 #include <cppcanvas/sprite.hxx>
 #include "implspritecanvas.hxx"
 
-namespace cppcanvas
+namespace cppcanvas::internal
 {
-    namespace internal
-    {
         class ImplSprite : public virtual Sprite
         {
         public:
@@ -61,7 +59,6 @@ namespace cppcanvas
             const css::uno::Reference< css::rendering::XSprite >          mxSprite;
             ImplSpriteCanvas::TransformationArbiterSharedPtr              mpTransformArbiter;
         };
-    }
 }
 
 #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 036022f48135..8e94bcb88c64 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -26,10 +26,8 @@
 #include <cppcanvas/spritecanvas.hxx>
 #include "implcanvas.hxx"
 
-namespace cppcanvas
+namespace cppcanvas::internal
 {
-    namespace internal
-    {
         class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas
         {
         public:
@@ -78,7 +76,6 @@ namespace cppcanvas
             const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas;
             TransformationArbiterSharedPtr                             mpTransformArbiter;
         };
-    }
 }
 
 #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX