compact namespace in ucb..uui

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

31 files changed, 79 insertions, 79 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index d21b74d5fb61..f6a86e704aae 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -40,9 +40,9 @@
 #define CACHED_CONTENT_RESULTSET_FACTORY_NAME "com.sun.star.ucb.CachedContentResultSetFactory"
 
 
-namespace com { namespace sun { namespace star { namespace script {
+namespace com::sun::star::script {
     class XTypeConverter;
-} } } }
+}
 
 class CCRS_PropertySetInfo;
 class CachedContentResultSet
diff --git a/ucb/source/core/FileAccess.hxx b/ucb/source/core/FileAccess.hxx
index dd5440e2a802..7b7b8a037103 100644
--- a/ucb/source/core/FileAccess.hxx
+++ b/ucb/source/core/FileAccess.hxx
@@ -26,10 +26,10 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
-namespace lang { class XMultiServiceFactory; }
-namespace uno { class XInterface; }
-} } }
+namespace com::sun::star {
+    namespace lang { class XMultiServiceFactory; }
+    namespace uno { class XInterface; }
+}
 
 #define IMPLEMENTATION_NAME "com.sun.star.comp.ucb.SimpleFileAccess"
 
diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx
index 1a253f405f3a..f8eabca8a180 100644
--- a/ucb/source/core/providermap.hxx
+++ b/ucb/source/core/providermap.hxx
@@ -24,9 +24,9 @@
 #include <com/sun/star/uno/Reference.h>
 #include <regexpmap.hxx>
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     class XContentProvider;
-} } } }
+}
 
 
 class ProviderListEntry_Impl
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index 41cd606561e7..fc478cb07dc0 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -43,10 +43,10 @@
 
 namespace comphelper { class OInterfaceContainerHelper2; }
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     class XCommandInfo;
     struct GlobalTransferCommandArgument2;
-} } } }
+}
 
 class UniversalContentBroker :
                 public cppu::WeakImplHelper<
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 82f27ce3af53..61c45434e36e 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -36,7 +36,7 @@
 
 #include <list>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         struct Property;
         struct PropertyValue;
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star {
     namespace sdbc {
         class XRow;
     }
-}}}
+}
 namespace ucbhelper
 {
     class Content;
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 241d9fb44853..67548a542570 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -25,7 +25,7 @@
 #include <vector>
 #include <list>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         struct Property;
         struct PropertyValue;
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star {
     namespace sdbc {
         class XRow;
     }
-}}}
+}
 namespace ucbhelper
 {
     class Content;
diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx
index ed0b6e93a5fd..a8f9956ead17 100644
--- a/ucb/source/ucp/ext/ucpext_content.hxx
+++ b/ucb/source/ucp/ext/ucpext_content.hxx
@@ -28,7 +28,7 @@
 #include <optional>
 
 
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
 {
 
 
@@ -129,7 +129,7 @@ namespace ucb { namespace ucp { namespace ext
     };
 
 
-} } }   // namespace ucb::ucp::ext
+} // namespace ucb::ucp::ext
 
 
 #endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_CONTENT_HXX
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
index c4c26172254a..28c6691d5f3f 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
@@ -26,7 +26,7 @@
 #include <memory>
 
 
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
 {
 
 
@@ -71,7 +71,7 @@ namespace ucb { namespace ucp { namespace ext
     };
 
 
-} } }   // namespace ucp::ext
+} // namespace ucp::ext
 
 
 #endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_DATASUPPLIER_HXX
diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx
index 77f98f8f48b7..1f64e3733826 100644
--- a/ucb/source/ucp/ext/ucpext_provider.hxx
+++ b/ucb/source/ucp/ext/ucpext_provider.hxx
@@ -23,7 +23,7 @@
 #include <ucbhelper/providerhelper.hxx>
 
 
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
 {
 
 
@@ -56,7 +56,7 @@ namespace ucb { namespace ucp { namespace ext
     };
 
 
-} } }   // namespace ucb::ucp::ext
+} // namespace ucb::ucp::ext
 
 
 #endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_PROVIDER_HXX
diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx
index 6fc963b4c31c..73817183642f 100644
--- a/ucb/source/ucp/ext/ucpext_resultset.hxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
 
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
 {
 
 
@@ -54,7 +54,7 @@ namespace ucb { namespace ucp { namespace ext
     };
 
 
-} } }   // namespace ucp::ext
+} // namespace ucp::ext
 
 
 #endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_RESULTSET_HXX
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index a44b73ffc392..90642fd7f88b 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -25,14 +25,14 @@
 #include <com/sun/star/ucb/XContentCreator.hpp>
 #include "ftpurl.hxx"
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct Property;
     struct PropertyValue;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace sdbc {
+namespace com::sun::star::sdbc {
     class XRow;
-} } } }
+}
 
 
 namespace ftp
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 7a41c7bca03d..d912ddac242d 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         struct Property;
         struct PropertyValue;
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star {
     namespace sdbc {
         class XRow;
     }
-}}}
+}
 namespace ucbhelper
 {
     class Content;
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index cff4a2832345..3e17ac35e643 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -27,18 +27,18 @@
 #include "hierarchydata.hxx"
 #include "hierarchyprovider.hxx"
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct Property;
     struct PropertyValue;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace sdbc {
+namespace com::sun::star::sdbc {
     class XRow;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     struct TransferInfo;
-} } } }
+}
 
 namespace hierarchy_ucp
 {
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index 324d016ad352..8810964b39c0 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -26,14 +26,14 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container {
         class XHierarchicalNameAccess;
     }
     namespace util {
         class XOfficeInstallationDirectories;
     }
-} } }
+}
 
 namespace hierarchy_ucp
 {
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index debf126fcaaf..1bc72e034dc0 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -26,14 +26,14 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <unordered_map>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container {
         class XHierarchicalNameAccess;
     }
     namespace util {
         class XOfficeInstallationDirectories;
     }
-} } }
+}
 
 namespace hierarchy_ucp {
 
diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx
index 19d459181b2f..62a3a39635e6 100644
--- a/ucb/source/ucp/inc/urihelper.hxx
+++ b/ucb/source/ucp/inc/urihelper.hxx
@@ -25,7 +25,7 @@
 #include <rtl/uri.hxx>
 
 
-namespace ucb_impl { namespace urihelper {
+namespace ucb_impl::urihelper {
 
     inline OUString encodeSegment( const OUString & rSegment )
     {
@@ -109,7 +109,7 @@ namespace ucb_impl { namespace urihelper {
         return aResult.makeStringAndClear();
     }
 
-} } // namespace
+} // namespace
 
 #endif // INCLUDED_UCB_SOURCE_UCP_INC_URIHELPER_HXX
 
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index c4d89c627f82..c17973775642 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -27,7 +27,7 @@
 #include <ucbhelper/contenthelper.hxx>
 #include "pkguri.hxx"
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans
     {
         struct Property;
@@ -51,7 +51,7 @@ namespace com { namespace sun { namespace star {
         struct OpenCommandArgument2;
         struct TransferInfo;
     }
-} } }
+}
 
 namespace package_ucp
 {
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 072f33783614..327000b890e0 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -26,9 +26,9 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include "pkguri.hxx"
 
-namespace com { namespace sun { namespace star { namespace container {
+namespace com::sun::star::container {
     class XHierarchicalNameAccess;
-} } } }
+}
 
 namespace package_ucp {
 
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 6d3a484462a2..c8cf050f655c 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -24,13 +24,13 @@
 #include <com/sun/star/ucb/XContentCreator.hpp>
 #include "tdoc_provider.hxx"
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sdbc  { class XRow; }
     namespace io    { class XInputStream; class XOutputStream; }
     namespace beans { struct PropertyValue; }
     namespace ucb   { struct OpenCommandArgument2; struct TransferInfo;
                       struct ContentInfo; }
-} } }
+}
 
 namespace tdoc_ucp
 {
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 617156b14318..c1498cd488f3 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -30,13 +30,13 @@
 #include "tdoc_docmgr.hxx"
 #include "tdoc_storage.hxx"
 
-namespace com { namespace sun { namespace star { namespace embed {
+namespace com::sun::star::embed {
     class XStorage;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
     class XModel;
-} } } }
+}
 
 namespace tdoc_ucp {
 
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index 163e4dcd51cd..8f11e8726286 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -37,9 +37,9 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include "DAVResource.hxx"
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct Property;
-} } } }
+}
 
 namespace webdav_ucp
 {
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 52891f342fed..72eaf39bdbf0 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -40,13 +40,13 @@
 #include "DAVTypes.hxx"
 #include "DAVRequestEnvironment.hxx"
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct NamedValue;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     struct Lock;
-} } } }
+}
 
 namespace webdav_ucp
 {
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
index bf5827e45836..d74e05aebbc1 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
@@ -42,13 +42,13 @@
 
 using namespace com::sun::star;
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct NamedValue;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     class XMultiServiceFactory;
-} } } }
+}
 
 namespace webdav_ucp
 {
diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
index 26635b894413..5abf6d400668 100644
--- a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
+++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
@@ -33,9 +33,9 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
     struct DateTime;
-} } } }
+}
 
 
 namespace webdav_ucp
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 1a2c4503036d..4a976a26b94c 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -39,25 +39,25 @@
 #include "DAVResourceAccess.hxx"
 #include "PropertyMap.hxx"
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct Property;
     struct PropertyValue;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
     class XInputStream;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace sdbc {
+namespace com::sun::star::sdbc {
     class XRow;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     struct OpenCommandArgument3;
     struct PostCommandArgument2;
     struct PropertyCommandArgument;
     struct TransferInfo;
-} } } }
+}
 
 namespace webdav_ucp
 {
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index 64fbb0584ca8..bb5a41eea85e 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include "DAVResource.hxx"
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct Property;
 } } } }
 
diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx
index d2b65cc82577..3d77ec5d5ac2 100644
--- a/ucb/source/ucp/webdav/DAVSession.hxx
+++ b/ucb/source/ucp/webdav/DAVSession.hxx
@@ -30,7 +30,7 @@
 #include "DAVTypes.hxx"
 #include "DAVRequestEnvironment.hxx"
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     struct Lock;
 } } } }
 
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
index 17a21bbfcc71..62d9cd7e13ea 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
@@ -34,7 +34,7 @@
 
 using namespace com::sun::star;
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     class XMultiServiceFactory;
 } } } }
 
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx
index a56d8fbc1a1a..d5c0d451b980 100644
--- a/ucb/source/ucp/webdav/DateTimeHelper.hxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx
@@ -24,7 +24,7 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
     struct DateTime;
 } } } }
 
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index fbd8e6300f4b..814b338a741d 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -30,20 +30,20 @@
 #include "DAVResourceAccess.hxx"
 #include "PropertyMap.hxx"
 
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
     struct Property;
     struct PropertyValue;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
     class XInputStream;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace sdbc {
+namespace com::sun::star::sdbc {
     class XRow;
 } } } }
 
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
     struct OpenCommandArgument2;
     struct PropertyCommandArgument;
     struct PostCommandArgument2;
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index b9a56f15c97c..322f530a1682 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -31,7 +31,7 @@
 #include <ucbhelper/providerhelper.hxx>
 #include "PropertyMap.hxx"
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
 class XSingleServiceFactory;
 } } } }