From 248ddbc4e9191c7f980fc8d6df6337fc535faab0 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 14 Jan 2020 16:26:23 +0200
Subject: clang-tidy modernize-concat-nested-namespace in cppcanvas..cppuhelper

Change-Id: I0bb4ea91288a15fb590d077fb390c53be8b50400
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86801
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 cppcanvas/source/mtfrenderer/bitmapaction.cxx            | 5 +----
 cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx     | 5 +----
 cppcanvas/source/mtfrenderer/implrenderer.cxx            | 5 +----
 cppcanvas/source/mtfrenderer/lineaction.cxx              | 5 +----
 cppcanvas/source/mtfrenderer/mtftools.cxx                | 5 +----
 cppcanvas/source/mtfrenderer/pointaction.cxx             | 5 +----
 cppcanvas/source/mtfrenderer/polypolyaction.cxx          | 5 +----
 cppcanvas/source/mtfrenderer/textaction.cxx              | 5 +----
 cppcanvas/source/mtfrenderer/textlineshelper.cxx         | 5 +----
 cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 5 +----
 10 files changed, 10 insertions(+), 40 deletions(-)

(limited to 'cppcanvas/source/mtfrenderer')

diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 84946014ef0b..b427142a874a 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -38,9 +38,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -217,6 +215,5 @@ namespace cppcanvas
                                                   rState );
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
index 9100188271d5..afaa100dce8f 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
@@ -29,9 +29,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         CachedPrimitiveBase::CachedPrimitiveBase( const CanvasSharedPtr& rCanvas,
                                                   bool                   bOnlyRedrawWithSameTransform ) :
@@ -79,6 +77,5 @@ namespace cppcanvas
                                     rTransformation );
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 7c4d91b1a8a2..ca5b531138c7 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -228,9 +228,7 @@ namespace
     }
 }
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         // state stack manipulators
 
@@ -3072,6 +3070,5 @@ namespace cppcanvas
             }
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index e032432e6848..ba479ddc9e9e 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -36,9 +36,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -152,6 +150,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 54ed0dbfaf3f..67e3fad6f720 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -36,9 +36,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace tools
+namespace cppcanvas::tools
     {
         void initRenderState( rendering::RenderState&                   renderState,
                               const ::cppcanvas::internal::OutDevState& outdevState )
@@ -669,6 +667,5 @@ namespace cppcanvas
             createStrikeoutPolyPolygon(rStrikeoutPolyPoly, aStartPos, rLineWidth, rTextLineInfo);
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 38896151b52e..67e2af712cd4 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -37,9 +37,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -171,6 +169,5 @@ namespace cppcanvas
             return std::make_shared<PointAction>( rPoint, rCanvas, rState, rColor );
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 15fa4f5bc776..5f570d662bfc 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -38,9 +38,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -503,6 +501,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 93e54c11dba5..c6acfb330a11 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -49,9 +49,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -2314,6 +2312,5 @@ namespace cppcanvas
             return ret;
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textlineshelper.cxx b/cppcanvas/source/mtfrenderer/textlineshelper.cxx
index db88e5cb5ee7..6bdc172e30ac 100644
--- a/cppcanvas/source/mtfrenderer/textlineshelper.cxx
+++ b/cppcanvas/source/mtfrenderer/textlineshelper.cxx
@@ -28,9 +28,7 @@ void initLineStyleWaveline(sal_uInt32 nLineStyle, bool& bIsWaveline, bool& bIsBo
 }
 }
 
-namespace cppcanvas
-{
-namespace internal
+namespace cppcanvas::internal
 {
 TextLinesHelper::TextLinesHelper(const CanvasSharedPtr& rCanvas, const OutDevState& rState)
     : mpCanvas(rCanvas)
@@ -123,5 +121,4 @@ void TextLinesHelper::render(const rendering::RenderState& rRenderState, bool bN
         xCanvas->fillPolyPolygon(mxStrikeout, rViewState, rRenderState);
 }
 }
-}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 48be63ed8702..5636b7608109 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -56,9 +56,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         // free support functions
         // ======================
@@ -474,6 +472,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit v1.2.3