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>

13 files changed, 13 insertions, 39 deletions

diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx
index cbd7051637a5..04f020663087 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -24,8 +24,7 @@
 
 #include <osl/diagnose.h>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 namespace {
 
@@ -287,7 +286,6 @@ bool AxBinaryPropertyReader::startNextProperty()
     return ensureValid() && bHasProp;
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx
index 85b3621b2733..7d76aefc9086 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -10,8 +10,7 @@
 
 #include <oox/ole/olehelper.hxx>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 namespace {
 
@@ -199,7 +198,6 @@ void AxBinaryPropertyWriter::startNextProperty( bool bSkip )
     mnNextProp <<= 1;
 }
 
-} // namespace exp
 } // namespace ole
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 57606fa1ce0b..8ce93ea1ffa5 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -64,8 +64,7 @@
 #include <oox/token/tokens.hxx>
 #include <tools/diagnose_ex.h>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
@@ -2779,7 +2778,6 @@ Reference< XIndexContainer > const & EmbeddedForm::createXForm()
     return mxFormIC;
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx
index fbc0546879ca..3e1f5c363126 100644
--- a/oox/source/ole/axcontrolfragment.cxx
+++ b/oox/source/ole/axcontrolfragment.cxx
@@ -31,8 +31,7 @@
 
 #include <osl/diagnose.h>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
@@ -163,7 +162,6 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const
     return nullptr;
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/axfontdata.cxx b/oox/source/ole/axfontdata.cxx
index 184a7d03ed10..2ebedd0cbdf5 100644
--- a/oox/source/ole/axfontdata.cxx
+++ b/oox/source/ole/axfontdata.cxx
@@ -22,8 +22,7 @@
 #include <oox/ole/axbinaryreader.hxx>
 #include <oox/ole/axbinarywriter.hxx>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 AxFontData::AxFontData() :
     mnFontEffects( AxFontFlags::NONE ),
@@ -113,7 +112,6 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm )
     return false;
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 05b787d9f85a..93de727d5097 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -46,8 +46,7 @@
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 using ::com::sun::star::form::XFormComponent;
 using ::com::sun::star::awt::XControlModel;
@@ -570,7 +569,6 @@ bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxModel, t
     return true;
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx
index cb909592f9b2..b7377d073e5d 100644
--- a/oox/source/ole/oleobjecthelper.cxx
+++ b/oox/source/ole/oleobjecthelper.cxx
@@ -34,8 +34,7 @@
 #include <oox/helper/propertymap.hxx>
 #include <oox/token/properties.hxx>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::container;
@@ -174,7 +173,6 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf
     return bRet;
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index c53f252554d9..39482fef013f 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -38,8 +38,7 @@
 #include <oox/helper/containerhelper.hxx>
 #include <oox/helper/helper.hxx>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
@@ -378,7 +377,6 @@ void OleStorage::implCommit() const
     }
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index da61e818c149..7ea5482e1e72 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -43,8 +43,7 @@
 #include <oox/token/tokens.hxx>
 #include <unordered_map>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::container;
@@ -863,7 +862,6 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib,
     }
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/vbahelper.cxx b/oox/source/ole/vbahelper.cxx
index 0869b2d05f44..477405ecf35d 100644
--- a/oox/source/ole/vbahelper.cxx
+++ b/oox/source/ole/vbahelper.cxx
@@ -22,8 +22,7 @@
 #include <osl/diagnose.h>
 #include <oox/helper/binaryinputstream.hxx>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 using namespace ::com::sun::star::uno;
 
@@ -55,7 +54,6 @@ bool VbaHelper::extractKeyValue( OUString& rKey, OUString& rValue, const OUStrin
     return false;
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx
index d00a02f32d7e..ae2ba98fa983 100644
--- a/oox/source/ole/vbainputstream.cxx
+++ b/oox/source/ole/vbainputstream.cxx
@@ -20,8 +20,7 @@
 #include <oox/ole/vbainputstream.hxx>
 #include <osl/diagnose.h>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 namespace {
 
@@ -204,7 +203,6 @@ bool VbaInputStream::updateChunk()
     return !mbEof;
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 82a368934794..b96e6f444a0a 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -33,8 +33,7 @@
 #include <oox/ole/vbahelper.hxx>
 #include <oox/ole/vbainputstream.hxx>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::script::vba;
@@ -335,7 +334,6 @@ void VbaModule::createModule( const OUString& rVBASourceCode,
     }
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index bf31f2a2350f..d53fa0780e0c 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -48,8 +48,7 @@
 #include <oox/ole/vbamodule.hxx>
 #include <oox/token/properties.hxx>
 
-namespace oox {
-namespace ole {
+namespace oox::ole {
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::container;
@@ -552,7 +551,6 @@ void VbaProject::copyStorage( StorageBase& rVbaPrjStrg )
     }
 }
 
-} // namespace ole
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */