From c82efb610bf556ea12cbe4f94568ac619897799f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 13 Jan 2020 19:48:37 +0200
Subject: 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>
---
 writerperfect/qa/unit/WpftFilterFixture.cxx                  | 5 +----
 writerperfect/qa/unit/WpftFilterTestBase.cxx                 | 5 +----
 writerperfect/qa/unit/WpftLoader.cxx                         | 5 +----
 writerperfect/source/writer/exp/XMLBase64ImportContext.cxx   | 7 ++-----
 writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx | 7 ++-----
 writerperfect/source/writer/exp/XMLSectionContext.cxx        | 7 ++-----
 writerperfect/source/writer/exp/XMLTextFrameContext.cxx      | 7 ++-----
 writerperfect/source/writer/exp/XMLTextListContext.cxx       | 7 ++-----
 writerperfect/source/writer/exp/XMLTextListItemContext.cxx   | 7 ++-----
 writerperfect/source/writer/exp/txtparai.cxx                 | 5 +----
 writerperfect/source/writer/exp/txtstyli.cxx                 | 7 ++-----
 writerperfect/source/writer/exp/xmlfmt.cxx                   | 7 ++-----
 writerperfect/source/writer/exp/xmlictxt.cxx                 | 7 ++-----
 writerperfect/source/writer/exp/xmlimp.cxx                   | 5 +----
 writerperfect/source/writer/exp/xmlmetai.cxx                 | 7 ++-----
 writerperfect/source/writer/exp/xmltbli.cxx                  | 7 ++-----
 writerperfect/source/writer/exp/xmltext.cxx                  | 7 ++-----
 17 files changed, 29 insertions(+), 80 deletions(-)

(limited to 'writerperfect')

diff --git a/writerperfect/qa/unit/WpftFilterFixture.cxx b/writerperfect/qa/unit/WpftFilterFixture.cxx
index f7c3dfcc5999..142ff22c36be 100644
--- a/writerperfect/qa/unit/WpftFilterFixture.cxx
+++ b/writerperfect/qa/unit/WpftFilterFixture.cxx
@@ -17,9 +17,7 @@ namespace document = com::sun::star::document;
 namespace frame = com::sun::star::frame;
 namespace uno = com::sun::star::uno;
 
-namespace writerperfect
-{
-namespace test
+namespace writerperfect::test
 {
 void WpftFilterFixture::setUp()
 {
@@ -33,6 +31,5 @@ void WpftFilterFixture::setUp()
     m_xTypeMap.set(m_xTypeDetection, uno::UNO_QUERY_THROW);
 }
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.cxx b/writerperfect/qa/unit/WpftFilterTestBase.cxx
index ea6ad5a89612..1c5989c792bb 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.cxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.cxx
@@ -17,9 +17,7 @@
 
 namespace uno = com::sun::star::uno;
 
-namespace writerperfect
-{
-namespace test
+namespace writerperfect::test
 {
 WpftFilterTestBase::WpftFilterTestBase(const OUString& rFactoryURL)
     : ::test::FiltersTest()
@@ -60,6 +58,5 @@ void WpftFilterTestBase::doTest(const OUString& rFilter, const OUString& rPath,
     m_pOptionalMap = nullptr;
 }
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx
index f29cd89c001f..f28937668e5b 100644
--- a/writerperfect/qa/unit/WpftLoader.cxx
+++ b/writerperfect/qa/unit/WpftLoader.cxx
@@ -38,9 +38,7 @@ namespace ucb = com::sun::star::ucb;
 namespace uno = com::sun::star::uno;
 namespace util = com::sun::star::util;
 
-namespace writerperfect
-{
-namespace test
+namespace writerperfect::test
 {
 WpftLoader::WpftLoader(const OUString& rURL,
                        const css::uno::Reference<css::document::XFilter>& rxFilter,
@@ -207,6 +205,5 @@ void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDes
     throw container::NoSuchElementException();
 }
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
index abae977a6389..f281e39a4556 100644
--- a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
@@ -13,9 +13,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 XMLBase64ImportContext::XMLBase64ImportContext(XMLImport& rImport)
     : XMLImportContext(rImport)
@@ -62,7 +60,6 @@ const librevenge::RVNGBinaryData& XMLBase64ImportContext::getBinaryData() const
     return m_aBinaryData;
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
index d11ad62e7357..cdc08c50b697 100644
--- a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
@@ -16,9 +16,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 namespace
 {
@@ -123,7 +121,6 @@ void XMLFootnoteImportContext::startElement(
     const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
 }
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.cxx b/writerperfect/source/writer/exp/XMLSectionContext.cxx
index dbd1f9663539..839400e52a36 100644
--- a/writerperfect/source/writer/exp/XMLSectionContext.cxx
+++ b/writerperfect/source/writer/exp/XMLSectionContext.cxx
@@ -14,9 +14,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 XMLSectionContext::XMLSectionContext(XMLImport& rImport)
     : XMLImportContext(rImport)
@@ -41,7 +39,6 @@ void XMLSectionContext::endElement(const OUString& /*rName*/)
     GetImport().GetGenerator().closeSection();
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
index 23a60970bc1a..d6f0a3fd5c30 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
@@ -18,9 +18,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 namespace
 {
@@ -168,7 +166,6 @@ void XMLTextFrameContext::endElement(const OUString& /*rName*/)
     GetImport().GetGenerator().closeFrame();
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLTextListContext.cxx b/writerperfect/source/writer/exp/XMLTextListContext.cxx
index 77a378e8179d..8798c9a396d6 100644
--- a/writerperfect/source/writer/exp/XMLTextListContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextListContext.cxx
@@ -13,9 +13,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 XMLTextListContext::XMLTextListContext(XMLImport& rImport)
     : XMLImportContext(rImport)
@@ -30,7 +28,6 @@ rtl::Reference<XMLImportContext> XMLTextListContext::CreateChildContext(
     return nullptr;
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLTextListItemContext.cxx b/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
index 16a64d0bcdaf..36f3f2ce63e7 100644
--- a/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
@@ -14,9 +14,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 XMLTextListItemContext::XMLTextListItemContext(XMLImport& rImport)
     : XMLImportContext(rImport)
@@ -33,7 +31,6 @@ rtl::Reference<XMLImportContext> XMLTextListItemContext::CreateChildContext(
     return nullptr;
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx
index e3ba3bde1f26..11dfd8cfe908 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -50,9 +50,7 @@ void FillStyle(const OUString& rName, std::map<OUString, librevenge::RVNGPropert
 }
 }
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 namespace
 {
@@ -627,7 +625,6 @@ void FillStyles(const OUString& rName,
     FillStyle(rName, rNamedStyles, rAutomaticStyles, rNamedStyles, rPropertyList);
 }
 
-} // namespace exp
 } // namespace writerperfect
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/txtstyli.cxx b/writerperfect/source/writer/exp/txtstyli.cxx
index 9c7a156de984..53ac4b4e52f0 100644
--- a/writerperfect/source/writer/exp/txtstyli.cxx
+++ b/writerperfect/source/writer/exp/txtstyli.cxx
@@ -13,9 +13,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 namespace
 {
@@ -412,7 +410,6 @@ librevenge::RVNGPropertyList& XMLStyleContext::GetPageLayoutPropertyList()
     return m_aPageLayoutPropertyList;
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmlfmt.cxx b/writerperfect/source/writer/exp/xmlfmt.cxx
index eaba8085fa4e..f34540dddc1e 100644
--- a/writerperfect/source/writer/exp/xmlfmt.cxx
+++ b/writerperfect/source/writer/exp/xmlfmt.cxx
@@ -17,9 +17,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 XMLStylesContext::XMLStylesContext(XMLImport& rImport, StyleType eType)
     : XMLImportContext(rImport)
@@ -292,7 +290,6 @@ rtl::Reference<XMLImportContext> XMLFontFaceDeclsContext::CreateChildContext(
     return nullptr;
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmlictxt.cxx b/writerperfect/source/writer/exp/xmlictxt.cxx
index 02ac21ab73e3..ebfe58402ff3 100644
--- a/writerperfect/source/writer/exp/xmlictxt.cxx
+++ b/writerperfect/source/writer/exp/xmlictxt.cxx
@@ -13,9 +13,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 XMLImportContext::XMLImportContext(XMLImport& rImport)
     : mrImport(rImport)
@@ -53,7 +51,6 @@ void XMLImportContext::setDocumentLocator(
 {
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx
index 09692ccc9308..9ade95990987 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -32,9 +32,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 namespace
 {
@@ -614,7 +612,6 @@ void XMLImport::HandlePageSpan(const librevenge::RVNGPropertyList& rPropertyList
     }
 }
 
-} // namespace exp
 } // namespace writerperfect
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmlmetai.cxx b/writerperfect/source/writer/exp/xmlmetai.cxx
index 76b8699f5e97..2e42f740f419 100644
--- a/writerperfect/source/writer/exp/xmlmetai.cxx
+++ b/writerperfect/source/writer/exp/xmlmetai.cxx
@@ -13,9 +13,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 namespace
 {
@@ -282,7 +280,6 @@ void XMPParser::processingInstruction(const OUString& /*rTarget*/, const OUStrin
 
 void XMPParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& /*xLocator*/) {}
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmltbli.cxx b/writerperfect/source/writer/exp/xmltbli.cxx
index 68e0b29116a4..0e5818f0b17f 100644
--- a/writerperfect/source/writer/exp/xmltbli.cxx
+++ b/writerperfect/source/writer/exp/xmltbli.cxx
@@ -17,9 +17,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 namespace
 {
@@ -251,7 +249,6 @@ void XMLTableContext::endElement(const OUString& /*rName*/)
     }
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmltext.cxx b/writerperfect/source/writer/exp/xmltext.cxx
index d976ebdbf846..01e185c4391c 100644
--- a/writerperfect/source/writer/exp/xmltext.cxx
+++ b/writerperfect/source/writer/exp/xmltext.cxx
@@ -17,9 +17,7 @@
 
 using namespace com::sun::star;
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 XMLBodyContentContext::XMLBodyContentContext(XMLImport& rImport)
     : XMLImportContext(rImport)
@@ -52,7 +50,6 @@ rtl::Reference<XMLImportContext> CreateTextChildContext(XMLImport& rImport, cons
     return nullptr;
 }
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit