clang-tidy modernize-concat-nested-namespace in oox

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

9 files changed, 9 insertions, 27 deletions

diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 16e08c0e15a2..058ee5c91815 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -38,8 +38,7 @@
 #include <tools/diagnose_ex.h>
 #include <tools/gen.hxx>
 
-namespace oox {
-namespace vml {
+namespace oox::vml {
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
@@ -338,7 +337,6 @@ void Drawing::notifyXShapeInserted( const Reference< XShape >& /*rxShape*/,
 {
 }
 
-} // namespace vml
 } // namespave oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx
index ed47e1446b4d..d56177ffdda6 100644
--- a/oox/source/vml/vmldrawingfragment.cxx
+++ b/oox/source/vml/vmldrawingfragment.cxx
@@ -26,8 +26,7 @@
 #include <oox/vml/vmlinputstream.hxx>
 #include <oox/vml/vmlshapecontext.hxx>
 
-namespace oox {
-namespace vml {
+namespace oox::vml {
 
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
@@ -78,7 +77,6 @@ void DrawingFragment::finalizeImport()
     mrDrawing.finalizeFragmentImport();
 }
 
-} // namespace vml
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 3d1d10e16fc2..de01cbab22b3 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -45,8 +45,7 @@
 #include <comphelper/propertysequence.hxx>
 #include <vcl/virdev.hxx>
 
-namespace oox {
-namespace vml {
+namespace oox::vml {
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::geometry;
@@ -982,7 +981,6 @@ void TextpathModel::pushToPropMap(ShapePropertyMap& rPropMap, const uno::Referen
     }
 }
 
-} // namespace vml
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index c2ab0fa2d914..2b8b97ca6ff7 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -28,8 +28,7 @@
 #include <oox/helper/helper.hxx>
 #include <oox/helper/textinputstream.hxx>
 
-namespace oox {
-namespace vml {
+namespace oox::vml {
 
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
@@ -392,7 +391,6 @@ OString InputStream::readToElementEnd()
     return aText;
 }
 
-} // namespace vml
 } // namespave oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index b928638954c4..15972cd0ff08 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -87,8 +87,7 @@ using ::com::sun::star::uno::Any;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::text;
 
-namespace oox {
-namespace vml {
+namespace oox::vml {
 
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::graphic;
@@ -1435,7 +1434,6 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
     return xGroupShape;
 }
 
-} // namespace vml
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx
index 71713d3e7120..d1a155465be3 100644
--- a/oox/source/vml/vmlshapecontainer.cxx
+++ b/oox/source/vml/vmlshapecontainer.cxx
@@ -24,8 +24,7 @@
 
 #include <osl/diagnose.h>
 
-namespace oox {
-namespace vml {
+namespace oox::vml {
 
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::drawing;
@@ -129,7 +128,6 @@ void ShapeContainer::convertAndInsert( const Reference< XShapes >& rxShapes, con
         shape->convertAndInsert( rxShapes, pParentAnchor );
 }
 
-} // namespace vml
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 76953fe750e7..d82d22ec2d7f 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -31,8 +31,7 @@
 
 #include <osl/diagnose.h>
 
-namespace oox {
-namespace vml {
+namespace oox::vml {
 
 using namespace ::com::sun::star;
 
@@ -604,7 +603,6 @@ ControlShapeContext::ControlShapeContext( ::oox::core::ContextHandler2Helper con
     rShapes.getDrawing().registerControl(aInfo);
 }
 
-} // namespace vml
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index f0f4a28f72d3..7713f2cdebaf 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -31,8 +31,7 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 
-namespace oox {
-namespace vml {
+namespace oox::vml {
 
 using namespace com::sun::star;
 
@@ -200,7 +199,6 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const
     }
 }
 
-} // namespace vml
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index 5f84ca33c2c6..57f611c9eea6 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -27,8 +27,7 @@
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 
-namespace oox {
-namespace vml {
+namespace oox::vml {
 
 using ::oox::core::ContextHandler2;
 using ::oox::core::ContextHandler2Helper;
@@ -285,7 +284,6 @@ void TextBoxContext::onEndElement()
     }
 }
 
-} // namespace vml
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */