clang-tidy modernize-concat-nested-namespace

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

9 files changed, 16 insertions, 27 deletions

diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index 459e0adc480a..c582b71aba82 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -22,8 +22,7 @@
 
 #include <sal/log.hxx>
 
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
 {
 
 /*
@@ -399,6 +398,6 @@ void OOXMLHyperlinkURLHandler::sprm(Sprm & /*rSprm*/)
 {
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
index 429c9ff4c35a..1cf7ba7d01cc 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
@@ -19,8 +19,7 @@
 #include "OOXMLBinaryObjectReference.hxx"
 #include <string.h>
 
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
 {
 
 using namespace ::com::sun::star;
@@ -67,6 +66,6 @@ void OOXMLBinaryObjectReference::resolve(BinaryObj & rHandler)
                   mSequence.size());
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index dbf002e1a664..3b963c1e34cf 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -51,8 +51,7 @@
 OUString customTarget;
 OUString embeddingsTarget;
 using namespace ::com::sun::star;
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
 {
 
 OOXMLDocumentImpl::OOXMLDocumentImpl(OOXMLStream::Pointer_t const & pStream, const uno::Reference<task::XStatusIndicator>& xStatusIndicator, bool bSkipImages, const uno::Sequence<beans::PropertyValue>& rDescriptor)
@@ -882,6 +881,5 @@ OOXMLDocumentFactory::createDocument
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index fde5ccc0b425..f9ba5df7e9da 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -22,8 +22,7 @@
 #include "OOXMLFactory.hxx"
 #include "OOXMLFastHelper.hxx"
 
-namespace writerfilter {
-namespace ooxml {
+namespace writerfilter::ooxml {
 
 using namespace com::sun::star;
 
@@ -215,6 +214,5 @@ void OOXMLFactory_ns::attributeAction(OOXMLFastContextHandler *, Token_t, const
 }
 
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 19dc3bb917e0..14f40a0494d8 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -46,8 +46,7 @@ static const sal_Unicode uSoftHyphen = 0xAD;
 static const sal_uInt8 cFtnEdnCont = 0x4;
 static const sal_uInt8 cFieldLock = 0x8;
 
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
 {
 using namespace ::com::sun::star;
 using namespace oox;
@@ -2149,6 +2148,6 @@ void OOXMLFastContextHandlerMath::process()
     }
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index d2aa979e5f2f..3fc69670b1cc 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -22,8 +22,7 @@
 #include "OOXMLFastContextHandler.hxx"
 #include "OOXMLFactory.hxx"
 
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
 {
 using namespace ::com::sun::star;
 using namespace ::std;
@@ -191,6 +190,6 @@ void OOXMLFastDocumentHandler::setIsSubstream( bool bSubstream )
     }
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index c7fc43e46bdd..fb7ad574457f 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -24,8 +24,7 @@
 
 #include <sal/log.hxx>
 
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
 {
 /*
   class OOXMLParserState
@@ -278,6 +277,6 @@ void OOXMLParserState::endTxbxContent()
     inTxbxContent = false;
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index 2165524954a2..15e3fc5523ea 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -26,8 +26,7 @@
 #include <sax/tools/converter.hxx>
 #include <tools/color.hxx>
 
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
 {
 using namespace ::std;
 using namespace com::sun::star;
@@ -856,6 +855,6 @@ void OOXMLPropertySetEntryToBool::attribute(Id nId, Value & rValue)
         mValue = (rValue.getInt() != 0);
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 2b773e02cf5e..d29cdf5b6a00 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -26,8 +26,7 @@
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <comphelper/storagehelper.hxx>
 
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
 {
 
 using namespace com::sun::star;
@@ -441,6 +440,6 @@ OOXMLDocumentFactory::createStream
     return pRet;
 }
 
-}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */