From a7f28581ad27705a86e6945f03cf219f7e4aa969 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 14 Jan 2020 20:53:45 +0200
Subject: 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>
---
 oox/source/dump/dffdumper.cxx  | 4 +---
 oox/source/dump/dumperbase.cxx | 4 +---
 oox/source/dump/oledumper.cxx  | 4 +---
 oox/source/dump/pptxdumper.cxx | 6 +-----
 4 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'oox/source/dump')

diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index dc02a1fa498b..1da86eda6c06 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -21,8 +21,7 @@
 
 #ifdef DBG_UTIL
 
-namespace oox {
-namespace dump {
+namespace oox::dump {
 
 namespace {
 
@@ -221,7 +220,6 @@ sal_uInt16 DffStreamObject::dumpDffOptPropHeader()
     return dumpHex< sal_uInt16 >( "id", "DFFOPT-PROPERTY-ID" );
 }
 
-} // namespace dump
 } // namespace oox
 
 #endif
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 5c44e54600b8..21b87b1b4a66 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -36,8 +36,7 @@
 
 #ifdef DBG_UTIL
 
-namespace oox {
-namespace dump {
+namespace oox::dump {
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -2565,7 +2564,6 @@ void DumperBase::construct( const ConfigRef& rxConfig )
         ObjectBase::construct( rxConfig );
 }
 
-} // namespace dump
 } // namespace oox
 
 #endif
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index f0ad198edef0..a2c6c98b1661 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -31,8 +31,7 @@
 
 #ifdef DBG_UTIL
 
-namespace oox {
-namespace dump {
+namespace oox::dump {
 
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
@@ -2081,7 +2080,6 @@ void ActiveXStorageObject::implDumpBaseStream( const BinaryInputStreamRef& rxStr
     FormControlStreamObject( *this, rxStrm, rSysFileName ).dump();
 }
 
-} // namespace dump
 } // namespace oox
 
 #endif
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index df9555f235e8..695fc4dfe721 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -26,9 +26,7 @@
 
 #ifdef DBG_UTIL
 
-namespace oox {
-namespace dump {
-namespace pptx {
+namespace oox::dump::pptx {
 
 using namespace ::com::sun::star::io;
 //using namespace ::com::sun::star::lang;
@@ -124,8 +122,6 @@ void Dumper::implDump()
     RootStorageObject( *this ).dump();
 }
 
-} // namespace pptx
-} // namespace dump
 } // namespace oox
 
 #endif
-- 
cgit