compact namespace in dbaccess..dtrans

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

18 files changed, 42 insertions, 66 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index ff8fd73a6923..9bc9b608ed21 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
@@ -31,10 +31,10 @@
 
 /// @HTML
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace task { class XInteractionRequest; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace dp_gui {
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 1148ba03c86a..2edf071df932 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -23,12 +23,12 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace deployment {
+namespace com::sun::star::deployment {
         class XPackage;
-}}}}
-namespace com { namespace sun { namespace star { namespace xml { namespace dom {
+}
+namespace com::sun::star::xml::dom {
         class XNode;
-}}}}}
+}
 
 
 namespace dp_gui {
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index e9cfd6f234f8..291f028504c4 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -40,11 +40,11 @@ class MouseEvent;
 class ResId;
 namespace vcl { class Window; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace deployment { class XExtensionManager;
                            class XPackage; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace dp_gui {
 /**
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index ea42a7273a5b..714bb969877f 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -26,12 +26,12 @@
 #include <vector>
 
 /// @HTML
-namespace com { namespace sun { namespace star { namespace deployment {
+namespace com::sun::star::deployment {
     class XExtensionManager;
-}}}}
-namespace com { namespace sun { namespace star { namespace uno {
+}
+namespace com::sun::star::uno {
     class XComponentContext;
-}}}}
+}
 
 namespace vcl { class Window; }
 
diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx
index ba8233aa9778..24c8a86fdc28 100644
--- a/desktop/source/deployment/inc/dp_dependencies.hxx
+++ b/desktop/source/deployment/inc/dp_dependencies.hxx
@@ -28,9 +28,9 @@
 
 /// @HTML
 
-namespace com { namespace sun { namespace star { namespace xml { namespace dom {
+namespace com::sun::star::xml::dom {
     class XElement;
-} } } } }
+}
 namespace dp_misc { class DescriptionInfoset; }
 
 namespace dp_misc {
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index 03990c9405b2..b404751fce52 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -30,7 +30,7 @@
 
 /// @HTML
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { class XComponentContext; }
     namespace xml {
         namespace dom {
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star {
         }
         namespace xpath { class XXPathAPI; }
     }
-} } }
+}
 
 namespace dp_misc {
 
diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx
index a3eb0681bb1e..5d766d5b21d1 100644
--- a/desktop/source/deployment/inc/dp_identifier.hxx
+++ b/desktop/source/deployment/inc/dp_identifier.hxx
@@ -27,9 +27,9 @@
 
 #include "dp_misc_api.hxx"
 
-namespace com { namespace sun { namespace star { namespace deployment {
+namespace com::sun::star::deployment {
     class XPackage;
-} } } }
+}
 
 namespace dp_misc {
 
diff --git a/desktop/source/deployment/inc/dp_package.hxx b/desktop/source/deployment/inc/dp_package.hxx
index 22ab1a5a2d4b..cf788c40bd31 100644
--- a/desktop/source/deployment/inc/dp_package.hxx
+++ b/desktop/source/deployment/inc/dp_package.hxx
@@ -25,12 +25,12 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace deployment { class XPackageRegistry; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
-namespace dp_registry { namespace backend { namespace bundle {
+namespace dp_registry::backend::bundle {
 
 css::uno::Reference<css::deployment::XPackageRegistry> create(
     css::uno::Reference<css::deployment::XPackageRegistry> const &
@@ -38,7 +38,7 @@ css::uno::Reference<css::deployment::XPackageRegistry> create(
     OUString const & context, OUString const & cachePath,
     css::uno::Reference<css::uno::XComponentContext> const & xComponentContext);
 
-} } }
+}
 
 #endif
 
diff --git a/desktop/source/deployment/inc/dp_registry.hxx b/desktop/source/deployment/inc/dp_registry.hxx
index 43746ddfc642..d58ec9a59039 100644
--- a/desktop/source/deployment/inc/dp_registry.hxx
+++ b/desktop/source/deployment/inc/dp_registry.hxx
@@ -25,10 +25,10 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace deployment { class XPackageRegistry; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace dp_registry {
 
diff --git a/desktop/source/deployment/inc/dp_services.hxx b/desktop/source/deployment/inc/dp_services.hxx
index 846e55a078dd..f40f908de0cd 100644
--- a/desktop/source/deployment/inc/dp_services.hxx
+++ b/desktop/source/deployment/inc/dp_services.hxx
@@ -12,7 +12,7 @@
 
 #include <sal/config.h>
 
-namespace comphelper { namespace service_decl { class ServiceDecl; } }
+namespace comphelper::service_decl { class ServiceDecl; }
 
 namespace dp_info {
 extern comphelper::service_decl::ServiceDecl const serviceDecl;
@@ -32,7 +32,7 @@ extern comphelper::service_decl::ServiceDecl const serviceDecl;
 
 }
 
-namespace dp_registry { namespace backend {
+namespace dp_registry::backend {
 
 namespace component {
 extern comphelper::service_decl::ServiceDecl const serviceDecl;
@@ -58,7 +58,7 @@ namespace sfwk {
 extern comphelper::service_decl::ServiceDecl const serviceDecl;
 }
 
-} }
+}
 
 #endif
 
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 56f9579f0003..b7bcdf50aa14 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -26,11 +26,7 @@
 #include <deque>
 #include <dp_backenddb.hxx>
 
-namespace com { namespace sun { namespace star {
-        namespace uno {
-        class XComponentContext;
-        }
-}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dp_registry {
 namespace backend {
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index 264030c0ef79..0b345cb3fe09 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -26,11 +26,7 @@
 #include <optional>
 #include <dp_backenddb.hxx>
 
-namespace com { namespace sun { namespace star {
-        namespace uno {
-        class XComponentContext;
-        }
-}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dp_registry {
 namespace backend {
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index 2dc951c14ece..d992b0248913 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -23,11 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <dp_backenddb.hxx>
 
-namespace com { namespace sun { namespace star {
-        namespace uno {
-        class XComponentContext;
-        }
-}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dp_registry {
 namespace backend {
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 1f072f7429df..18e0aa4a0743 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -24,11 +24,7 @@
 #include <optional>
 #include <dp_backenddb.hxx>
 
-namespace com { namespace sun { namespace star {
-        namespace uno {
-        class XComponentContext;
-        }
-}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dp_registry {
 namespace backend {
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index 57e3131cb1f9..8fd0cd0e8ad1 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -25,18 +25,18 @@
 #include <deque>
 #include <vector>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
         namespace uno {
-        class XComponentContext;
+            class XComponentContext;
         }
-        namespace xml { namespace dom {
+        namespace xml::dom {
             class XDocument;
             class XNode;
-        }}
-        namespace xml { namespace xpath {
+        }
+        namespace xml::xpath {
             class XXPathAPI;
-        }}
-}}}
+        }
+}
 
 namespace dp_registry {
 namespace backend {
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index ac91a62e9252..51427e73b9fd 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -27,11 +27,7 @@
 
 #include <dp_backenddb.hxx>
 
-namespace com { namespace sun { namespace star {
-        namespace uno {
-        class XComponentContext;
-        }
-}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dp_registry {
 namespace backend {
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index adccfa44e05b..00e9ab34842e 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -22,14 +22,14 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class XComponentContext;
     }
     namespace ucb {
         class XCommandEnvironment;
     }
-}}}
+}
 
 
 namespace dp_registry {
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
index 3f2cfed20a2e..61e993c9025a 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
@@ -24,11 +24,7 @@
 #include <dp_backenddb.hxx>
 #include <optional>
 
-namespace com { namespace sun { namespace star {
-        namespace uno {
-        class XComponentContext;
-        }
-}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dp_registry {
 namespace backend {