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>

15 files changed, 26 insertions, 80 deletions

diff --git a/writerfilter/source/rtftok/rtfcharsets.cxx b/writerfilter/source/rtftok/rtfcharsets.cxx
index 4309351d9f70..69e416ce8bc5 100644
--- a/writerfilter/source/rtftok/rtfcharsets.cxx
+++ b/writerfilter/source/rtftok/rtfcharsets.cxx
@@ -10,9 +10,7 @@
 #include "rtfcharsets.hxx"
 #include <sal/macros.h>
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 // See RTF spec v1.9.1, page 19
 RTFEncoding const aRTFEncodings[] = {
@@ -52,7 +50,6 @@ RTFEncoding const aRTFEncodings[] = {
 
 int nRTFEncodings = SAL_N_ELEMENTS(aRTFEncodings);
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 7f3f7f9573d2..38bc9d6dd442 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -10,9 +10,7 @@
 #include "rtfcontrolwords.hxx"
 #include <oox/token/namespaces.hxx>
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFSymbol const aRTFControlWords[] = {
     // sKeyword nControlType nIndex
@@ -1897,7 +1895,6 @@ bool RTFMathSymbol::operator<(const RTFMathSymbol& rOther) const
     return m_eKeyword < rOther.m_eKeyword;
 }
 
-} // namespace rtftok
 } // namespace writerfilter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 79dfe91504c6..0afb3c1f395c 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -30,9 +30,7 @@
 
 using namespace com::sun::star;
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
 {
@@ -661,7 +659,6 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
     return RTFError::OK;
 }
 
-} // namespace rtftok
 } // namespace writerfilter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 894716b2897c..58d4eecf5c26 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -26,9 +26,7 @@
 
 using namespace com::sun::star;
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 {
@@ -1229,7 +1227,6 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
     return RTFError::OK;
 }
 
-} // namespace rtftok
 } // namespace writerfilter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index 69879fcd1b62..54886fb81d9e 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -21,9 +21,7 @@
 
 using namespace com::sun::star;
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 {
@@ -429,7 +427,6 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
     return RTFError::OK;
 }
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentfactory.cxx b/writerfilter/source/rtftok/rtfdocumentfactory.cxx
index 5a8de68916c3..75b109b6842d 100644
--- a/writerfilter/source/rtftok/rtfdocumentfactory.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentfactory.cxx
@@ -9,9 +9,7 @@
 
 #include "rtfdocumentimpl.hxx"
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFDocument::Pointer_t RTFDocumentFactory::createDocument(
     css::uno::Reference<css::uno::XComponentContext> const& xContext,
@@ -25,7 +23,6 @@ RTFDocument::Pointer_t RTFDocumentFactory::createDocument(
                                rMediaDescriptor);
 }
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index bb491e363ae9..7981ee6126ba 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -75,9 +75,7 @@ util::DateTime getDateTimeFromUserProp(const OUString& rString)
 }
 } // anonymous namespace
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 Id getParagraphBorder(sal_uInt32 nIndex)
 {
@@ -3830,7 +3828,6 @@ bool RTFFrame::hasProperties() const
            || m_nVertAnchor != 0;
 }
 
-} // namespace rtftok
 } // namespace writerfilter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx
index d60057d52bb1..d3a84683d3d8 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/writerfilter/source/rtftok/rtflookahead.cxx
@@ -12,25 +12,14 @@
 #include <tools/stream.hxx>
 #include "rtftokenizer.hxx"
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace task
+namespace com::sun::star::task
 {
 class XStatusIndicator;
 }
-}
-}
-}
 
 using namespace com::sun::star;
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFLookahead::RTFLookahead(SvStream& rStream, sal_uInt64 nGroupStart)
     : m_rStream(rStream)
@@ -107,7 +96,6 @@ void RTFLookahead::finishSubstream() {}
 
 bool RTFLookahead::isSubstream() const { return false; }
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx
index c2d88ccb9194..d32557bc7d46 100644
--- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx
+++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx
@@ -9,9 +9,7 @@
 
 #include "rtfreferenceproperties.hxx"
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFReferenceProperties::RTFReferenceProperties(RTFSprms aAttributes, RTFSprms aSprms)
     : m_aAttributes(std::move(aAttributes))
@@ -37,7 +35,6 @@ void RTFReferenceProperties::resolve(Properties& rHandler)
     }
 }
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfreferencetable.cxx b/writerfilter/source/rtftok/rtfreferencetable.cxx
index 48785b0559c1..ffa9eddaec9a 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.cxx
+++ b/writerfilter/source/rtftok/rtfreferencetable.cxx
@@ -9,9 +9,7 @@
 
 #include "rtfreferencetable.hxx"
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFReferenceTable::RTFReferenceTable(Entries_t aEntries)
     : m_aEntries(std::move(aEntries))
@@ -26,7 +24,6 @@ void RTFReferenceTable::resolve(Table& rHandler)
         rHandler.entry(rEntry.first, rEntry.second);
 }
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 86cae03f4260..b0bd39d79830 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -53,9 +53,7 @@
 
 using namespace com::sun::star;
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFSdrImport::RTFSdrImport(RTFDocumentImpl& rDocument,
                            uno::Reference<lang::XComponent> const& xDstDoc)
@@ -1148,7 +1146,6 @@ void RTFSdrImport::appendGroupProperty(const OUString& aKey, const OUString& aVa
         applyProperty(xShape, aKey, aValue);
 }
 
-} // namespace rtftok
 } // namespace writerfilter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfskipdestination.cxx b/writerfilter/source/rtftok/rtfskipdestination.cxx
index 8e17b8c47d6b..47ada340e8b8 100644
--- a/writerfilter/source/rtftok/rtfskipdestination.cxx
+++ b/writerfilter/source/rtftok/rtfskipdestination.cxx
@@ -12,9 +12,7 @@
 #include <sal/log.hxx>
 #include "rtflistener.hxx"
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFSkipDestination::RTFSkipDestination(RTFListener& rImport)
     : m_rImport(rImport)
@@ -40,7 +38,6 @@ void RTFSkipDestination::setParsed(bool bParsed) { m_bParsed = bParsed; }
 
 void RTFSkipDestination::setReset(bool bReset) { m_bReset = bReset; }
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index c7ae29effe2e..22cdda6b4b6f 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -14,9 +14,7 @@
 #include "rtfdocumentimpl.hxx"
 #include <algorithm>
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFSprm::RTFSprm(Id nKeyword, RTFValue::Pointer_t& pValue)
     : m_nKeyword(nKeyword)
@@ -438,7 +436,6 @@ void RTFSprms::clear()
     m_pSprms = tools::SvRef<RTFSprmsImpl>(new RTFSprmsImpl);
 }
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 0b39232cd983..5f5782cea8d7 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -23,9 +23,7 @@
 
 using namespace com::sun::star;
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 std::unordered_map<OString, RTFSymbol> RTFTokenizer::s_aRTFControlWords;
 bool RTFTokenizer::s_bControlWordsInitialised;
@@ -328,7 +326,6 @@ OUString RTFTokenizer::getPosition()
     return aRet.makeStringAndClear();
 }
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index 49ebfc10eef4..e4b3a5a11c68 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -13,9 +13,7 @@
 
 using namespace com::sun::star;
 
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
 {
 RTFValue::RTFValue(int nValue, OUString sValue, const RTFSprms& rAttributes, const RTFSprms& rSprms,
                    uno::Reference<drawing::XShape> xShape, uno::Reference<io::XInputStream> xStream,
@@ -207,7 +205,6 @@ RTFSprms& RTFValue::getAttributes() { return *m_pAttributes; }
 
 RTFSprms& RTFValue::getSprms() { return *m_pSprms; }
 
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */