compact namespace: dbaccess,desktop

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

3 files changed, 29 insertions, 45 deletions

diff --git a/dbaccess/source/filter/hsqldb/utils.hxx b/dbaccess/source/filter/hsqldb/utils.hxx
index b2d54fbc1a50..1381d1d21c19 100644
--- a/dbaccess/source/filter/hsqldb/utils.hxx
+++ b/dbaccess/source/filter/hsqldb/utils.hxx
@@ -12,9 +12,7 @@
 
 #include <rtl/ustring.hxx>
 
-namespace dbahsql
-{
-namespace utils
+namespace dbahsql::utils
 {
 OUString convertToUTF8(const OString& original);
 
@@ -22,7 +20,6 @@ OUString getTableNameFromStmt(const OUString& sSql);
 
 void ensureFirebirdTableLength(const OUString& sName);
 }
-}
 
 #endif // INCLUDED_DBACCESS_SOURCE_FILTER_HSQLDB_UTILS_HXX
 
diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx
index b7917fdeb526..77e0dc7ab632 100644
--- a/dbaccess/source/ui/inc/queryfilter.hxx
+++ b/dbaccess/source/ui/inc/queryfilter.hxx
@@ -26,32 +26,26 @@
 #include <connectivity/predicateinput.hxx>
 #include <svx/ParseContext.hxx>
 
-namespace com
-{
-    namespace sun
+namespace com::sun::star {
+    namespace sdb
+    {
+        class XSingleSelectQueryComposer;
+    }
+    namespace sdbc
+    {
+        class XConnection;
+        class XDatabaseMetaData;
+    }
+    namespace container
+    {
+        class XNameAccess;
+    }
+    namespace beans
     {
-        namespace star
-        {
-            namespace sdb
-            {
-                class XSingleSelectQueryComposer;
-            }
-            namespace sdbc
-            {
-                class XConnection;
-                class XDatabaseMetaData;
-            }
-            namespace container
-            {
-                class XNameAccess;
-            }
-            namespace beans
-            {
-                struct PropertyValue;
-            }
-        }
+        struct PropertyValue;
     }
 }
+
 // DlgFilterCrit
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx
index 2207be16a051..c229a538642f 100644
--- a/dbaccess/source/ui/inc/queryorder.hxx
+++ b/dbaccess/source/ui/inc/queryorder.hxx
@@ -23,25 +23,18 @@
 
 #define DOG_ROWS    3
 
-namespace com
-{
-    namespace sun
+namespace com::sun::star{
+    namespace sdb
+    {
+        class XSingleSelectQueryComposer;
+    }
+    namespace sdbc
+    {
+        class XConnection;
+    }
+    namespace container
     {
-        namespace star
-        {
-            namespace sdb
-            {
-                class XSingleSelectQueryComposer;
-            }
-            namespace sdbc
-            {
-                class XConnection;
-            }
-            namespace container
-            {
-                class XNameAccess;
-            }
-        }
+        class XNameAccess;
     }
 }