compact namespace: writerperfect

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

17 files changed, 33 insertions, 108 deletions

diff --git a/writerperfect/source/writer/EPUBExportFilter.hxx b/writerperfect/source/writer/EPUBExportFilter.hxx
index 1b9f830300fe..aef92930d8ac 100644
--- a/writerperfect/source/writer/EPUBExportFilter.hxx
+++ b/writerperfect/source/writer/EPUBExportFilter.hxx
@@ -18,19 +18,10 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace uno
+namespace com::sun::star::uno
 {
 class XComponentContext;
 }
-}
-}
-}
 
 namespace writerperfect
 {
diff --git a/writerperfect/source/writer/EPUBExportUIComponent.hxx b/writerperfect/source/writer/EPUBExportUIComponent.hxx
index 8b5852fcc69b..115b3c79cc70 100644
--- a/writerperfect/source/writer/EPUBExportUIComponent.hxx
+++ b/writerperfect/source/writer/EPUBExportUIComponent.hxx
@@ -20,19 +20,10 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <cppuhelper/implbase.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace uno
+namespace com::sun::star::uno
 {
 class XComponentContext;
 }
-}
-}
-}
 
 namespace writerperfect
 {
diff --git a/writerperfect/source/writer/EPUBPackage.hxx b/writerperfect/source/writer/EPUBPackage.hxx
index 00cd129d8045..74c8863650e2 100644
--- a/writerperfect/source/writer/EPUBPackage.hxx
+++ b/writerperfect/source/writer/EPUBPackage.hxx
@@ -15,11 +15,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Reference.h>
 
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
 {
 namespace beans
 {
@@ -37,16 +33,11 @@ namespace uno
 {
 class XComponentContext;
 }
-namespace xml
-{
-namespace sax
+namespace xml::sax
 {
 class XWriter;
 }
 }
-}
-}
-}
 
 namespace writerperfect
 {
diff --git a/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx b/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx
index 1fc1325fd2ce..5610dc4b0be4 100644
--- a/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx
+++ b/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx
@@ -16,9 +16,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <office:binary-data>.
 class XMLBase64ImportContext : public XMLImportContext
@@ -40,8 +38,7 @@ private:
     OUString m_aBase64CharsLeft;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx b/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx
index 22594f2ddd76..bb771dd3d082 100644
--- a/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx
+++ b/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx
@@ -16,9 +16,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <text:note>.
 class XMLFootnoteImportContext : public XMLImportContext
@@ -38,8 +36,7 @@ private:
     librevenge::RVNGPropertyList m_aProperties;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.hxx b/writerperfect/source/writer/exp/XMLSectionContext.hxx
index 20c4047c0c2e..7b5922cdd68f 100644
--- a/writerperfect/source/writer/exp/XMLSectionContext.hxx
+++ b/writerperfect/source/writer/exp/XMLSectionContext.hxx
@@ -12,9 +12,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <text:section>.
 class XMLSectionContext : public XMLImportContext
@@ -31,8 +29,7 @@ public:
     void SAL_CALL endElement(const OUString& rName) override;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.hxx b/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
index fa8c52123afb..162445e5b2b8 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
@@ -14,9 +14,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 class XMLBase64ImportContext;
 
@@ -36,8 +34,7 @@ public:
     void SAL_CALL endElement(const OUString& rName) override;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/XMLTextListContext.hxx b/writerperfect/source/writer/exp/XMLTextListContext.hxx
index d5145465da77..5b895c196fb8 100644
--- a/writerperfect/source/writer/exp/XMLTextListContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextListContext.hxx
@@ -12,9 +12,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <text:list>.
 class XMLTextListContext : public XMLImportContext
@@ -27,8 +25,7 @@ public:
                        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/XMLTextListItemContext.hxx b/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
index c66fac6a2104..9959e78ceb29 100644
--- a/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
@@ -12,9 +12,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <text:list-item>.
 class XMLTextListItemContext : public XMLImportContext
@@ -27,8 +25,7 @@ public:
                        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/txtparai.hxx b/writerperfect/source/writer/exp/txtparai.hxx
index 561be4f0a115..f49553643332 100644
--- a/writerperfect/source/writer/exp/txtparai.hxx
+++ b/writerperfect/source/writer/exp/txtparai.hxx
@@ -16,9 +16,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <text:p>/<text:h>.
 class XMLParaContext : public XMLImportContext
@@ -57,8 +55,7 @@ void FillStyles(const OUString& rName,
                 std::map<OUString, librevenge::RVNGPropertyList>& rNamedStyles,
                 librevenge::RVNGPropertyList& rPropertyList);
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/txtstyli.hxx b/writerperfect/source/writer/exp/txtstyli.hxx
index c4ddc488899e..4aa2fc669b02 100644
--- a/writerperfect/source/writer/exp/txtstyli.hxx
+++ b/writerperfect/source/writer/exp/txtstyli.hxx
@@ -14,9 +14,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 class XMLStylesContext;
 
@@ -58,8 +56,7 @@ private:
     XMLStylesContext& m_rStyles;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/xmlfmt.hxx b/writerperfect/source/writer/exp/xmlfmt.hxx
index 6f3211de258f..71457d9bc579 100644
--- a/writerperfect/source/writer/exp/xmlfmt.hxx
+++ b/writerperfect/source/writer/exp/xmlfmt.hxx
@@ -19,9 +19,7 @@ namespace librevenge
 class RVNGPropertyList;
 }
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <office:automatic-styles>/<office:styles>.
 class XMLStylesContext : public XMLImportContext
@@ -71,8 +69,7 @@ public:
                        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/xmlictxt.hxx b/writerperfect/source/writer/exp/xmlictxt.hxx
index a0ea42bc63df..bb7f7598a826 100644
--- a/writerperfect/source/writer/exp/xmlictxt.hxx
+++ b/writerperfect/source/writer/exp/xmlictxt.hxx
@@ -15,9 +15,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 class XMLImport;
 
@@ -49,8 +47,7 @@ private:
     XMLImport& mrImport;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx
index 6994be4720ac..85cec8506819 100644
--- a/writerperfect/source/writer/exp/xmlimp.hxx
+++ b/writerperfect/source/writer/exp/xmlimp.hxx
@@ -24,11 +24,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
 {
 namespace beans
 {
@@ -43,12 +39,8 @@ namespace uri
 class XUriReferenceFactory;
 }
 }
-}
-}
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 class XMLImportContext;
 
@@ -153,8 +145,7 @@ public:
     setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator>& xLocator) override;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/xmlmetai.hxx b/writerperfect/source/writer/exp/xmlmetai.hxx
index 1f3e0d774794..7a48cf007089 100644
--- a/writerperfect/source/writer/exp/xmlmetai.hxx
+++ b/writerperfect/source/writer/exp/xmlmetai.hxx
@@ -14,9 +14,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <office:meta>.
 class XMLMetaDocumentContext : public XMLImportContext
@@ -81,8 +79,7 @@ private:
     OUString m_aDate;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/xmltbli.hxx b/writerperfect/source/writer/exp/xmltbli.hxx
index dff4dda2f988..e29c2b1edc65 100644
--- a/writerperfect/source/writer/exp/xmltbli.hxx
+++ b/writerperfect/source/writer/exp/xmltbli.hxx
@@ -14,9 +14,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <table:table>.
 class XMLTableContext : public XMLImportContext
@@ -42,8 +40,7 @@ private:
     librevenge::RVNGPropertyListVector m_aColumns;
 };
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif
 
diff --git a/writerperfect/source/writer/exp/xmltext.hxx b/writerperfect/source/writer/exp/xmltext.hxx
index 756a7ddbcb64..2a7ef2654637 100644
--- a/writerperfect/source/writer/exp/xmltext.hxx
+++ b/writerperfect/source/writer/exp/xmltext.hxx
@@ -12,9 +12,7 @@
 
 #include "xmlictxt.hxx"
 
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
 {
 /// Handler for <office:text>.
 class XMLBodyContentContext : public XMLImportContext
@@ -32,8 +30,7 @@ public:
 rtl::Reference<XMLImportContext> CreateTextChildContext(XMLImport& rImport, const OUString& rName,
                                                         bool bTopLevel = false);
 
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
 
 #endif