compact namespace: comphelper

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

9 files changed, 13 insertions, 66 deletions

diff --git a/include/comphelper/automationinvokedzone.hxx b/include/comphelper/automationinvokedzone.hxx
index 13b674efa7e1..81b0bfab6b4d 100644
--- a/include/comphelper/automationinvokedzone.hxx
+++ b/include/comphelper/automationinvokedzone.hxx
@@ -15,9 +15,7 @@
 // Helpers for use when calling into LO from an Automation (OLE
 // Automation) client.
 
-namespace comphelper
-{
-namespace Automation
+namespace comphelper::Automation
 {
 // Create an object of this class at the start of a function directly invoked from an Automation
 // client.
@@ -32,7 +30,6 @@ public:
     static bool isActive();
 };
 }
-}
 
 #endif // INCLUDED_COMPHELPER_AUTOMATIONINVOKEDZONE_HXX
 
diff --git a/include/comphelper/graphicmimetype.hxx b/include/comphelper/graphicmimetype.hxx
index c278ee669d03..5380c43a4cb0 100644
--- a/include/comphelper/graphicmimetype.hxx
+++ b/include/comphelper/graphicmimetype.hxx
@@ -16,32 +16,14 @@
 
 #include <com/sun/star/uno/Reference.h>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace graphic
+namespace com::sun::star::graphic
 {
 class XGraphic;
 }
-}
-}
-}
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace io
+namespace com::sun::star::io
 {
 class XInputStream;
 }
-}
-}
-}
 
 namespace comphelper
 {
diff --git a/include/comphelper/interfacecontainer3.hxx b/include/comphelper/interfacecontainer3.hxx
index d912777fe724..56cbeca61433 100644
--- a/include/comphelper/interfacecontainer3.hxx
+++ b/include/comphelper/interfacecontainer3.hxx
@@ -26,19 +26,10 @@
 #include <o3tl/cow_wrapper.hxx>
 #include <vector>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace uno
+namespace com::sun::star::uno
 {
 class XInterface;
 }
-}
-}
-}
 namespace osl
 {
 class Mutex;
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index a457c47b00a5..b8276ea49fc6 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -18,10 +18,7 @@ class LanguageTag;
 // Interface between the LibreOfficeKit implementation called by LibreOfficeKit clients and other
 // LibreOffice code.
 
-namespace comphelper
-{
-
-namespace LibreOfficeKit
+namespace comphelper::LibreOfficeKit
 {
 
 // Functions to be called only from the LibreOfficeKit implementation in desktop, not from other
@@ -119,7 +116,6 @@ COMPHELPER_DLLPUBLIC void statusIndicatorSetValue(int percent);
 COMPHELPER_DLLPUBLIC void statusIndicatorFinish();
 
 }
-}
 
 #endif // INCLUDED_COMPHELPER_LOK_HXX
 
diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx
index d4efbf39b4f4..2fa651406411 100644
--- a/include/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
@@ -30,10 +30,7 @@ namespace com::sun::star::io { class XOutputStream; }
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
-namespace comphelper
-{
-
-namespace OFOPXMLHelper {
+namespace comphelper::OFOPXMLHelper {
 
     // returns sequence of elements, where each element is described by sequence of tags,
     // where each tag is described by StringPair ( First - name, Second - value )
@@ -93,9 +90,7 @@ namespace OFOPXMLHelper {
         const css::uno::Sequence< css::beans::StringPair >& aOverridesSequence,
         const css::uno::Reference< css::uno::XComponentContext >& rContext );
 
-} // namespace OFOPXMLHelper
-
-} // namespace comphelper
+} // namespace comphelper::OFOPXMLHelper
 
 #endif
 
diff --git a/include/comphelper/random.hxx b/include/comphelper/random.hxx
index 218d61683a1c..4eee4ff2de1f 100644
--- a/include/comphelper/random.hxx
+++ b/include/comphelper/random.hxx
@@ -12,10 +12,7 @@
 
 #include <comphelper/comphelperdllapi.h>
 
-namespace comphelper
-{
-
-namespace rng
+namespace comphelper::rng
 {
 
 // These functions obey the SAL_RAND_REPEATABLE environment
@@ -38,8 +35,6 @@ COMPHELPER_DLLPUBLIC size_t uniform_size_distribution(size_t a, size_t b);
 
 } // namespace
 
-} // namespace
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index 8175b2f96ea0..8a25d8e5a911 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -27,8 +27,7 @@
 #include <functional>
 #include <initializer_list>
 
-namespace comphelper {
-namespace service_decl {
+namespace comphelper::service_decl {
 
 class ServiceDecl;
 
@@ -328,8 +327,7 @@ COMPHELPER_DLLPUBLIC
 void* component_getFactoryHelper( const char* pImplName,
                                   std::initializer_list<ServiceDecl const *> args );
 
-} // namespace service_decl
-} // namespace comphelper
+} // namespace comphelper::service_decl
 
 
 #endif //  ! defined( INCLUDED_COMPHELPER_SERVICEDECL_HXX)
diff --git a/include/comphelper/xmlsechelper.hxx b/include/comphelper/xmlsechelper.hxx
index 5bf3add901f1..48703053c230 100644
--- a/include/comphelper/xmlsechelper.hxx
+++ b/include/comphelper/xmlsechelper.hxx
@@ -27,9 +27,7 @@
 
 #include <vector>
 
-namespace comphelper
-{
-namespace xmlsec
+namespace comphelper::xmlsec
 {
 COMPHELPER_DLLPUBLIC OUString GetCertificateKind(const css::security::CertificateKind& rKind);
 
@@ -42,7 +40,6 @@ COMPHELPER_DLLPUBLIC OUString GetContentPart(const OUString& _rRawString,
 COMPHELPER_DLLPUBLIC OUString GetHexString(const css::uno::Sequence<sal_Int8>& _rSeq,
                                            const char* _pSep, sal_uInt16 _nLineBreak = 0xFFFF);
 }
-}
-#endif
 
+#endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/xmltools.hxx b/include/comphelper/xmltools.hxx
index e40ea4e24a26..9ef64b17db5e 100644
--- a/include/comphelper/xmltools.hxx
+++ b/include/comphelper/xmltools.hxx
@@ -13,14 +13,10 @@
 #include <rtl/string.hxx>
 #include <comphelper/comphelperdllapi.h>
 
-namespace comphelper
+namespace comphelper::xml
 {
-    namespace xml
-    {
         COMPHELPER_DLLPUBLIC OString makeXMLChaff();
         COMPHELPER_DLLPUBLIC OString generateGUIDString();
-
-    }
 }
 
 #endif