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>

31 files changed, 54 insertions, 68 deletions

diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 4a671e7c6dfc..522d77fafc01 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -29,7 +29,7 @@
 
 #include <vector>
 
-namespace com{ namespace sun { namespace star{namespace sdbc{ class XParameters; } } } }
+namespace com::sun::star::sdbc{ class XParameters; }
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 81b151bd15d8..1031ed5dcce7 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -43,10 +43,10 @@
 
 #include <functional>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sdb { struct RowChangeEvent; }
     namespace lang { struct Locale; }
-} } }
+}
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index 429d3d93c5aa..5246984ce97e 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -27,9 +27,7 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index e78c7bf06be7..87686496a77d 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -37,9 +37,7 @@
 #include <connectivity/sqlerror.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace beans {
-    struct PropertyValue;
-} } } }
+namespace com::sun::star::beans { struct PropertyValue; }
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx
index 1659874a5f97..37c6ea511bc5 100644
--- a/dbaccess/source/core/inc/RefreshListener.hxx
+++ b/dbaccess/source/core/inc/RefreshListener.hxx
@@ -22,11 +22,8 @@
 
 #include <com/sun/star/uno/Reference.h>
 
-namespace com { namespace sun { namespace star { namespace container
-{
-    class XNameAccess;
-}
-}}}
+namespace com::sun::star::container { class XNameAccess; }
+
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
index bb2634b7611d..be2f48fdb30d 100644
--- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
+++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
@@ -35,10 +35,10 @@
 #include <comphelper/propertycontainer.hxx>
 #include <svx/ParseContext.hxx>
 
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
     class XNumberFormatsSupplier;
     class XNumberFormatter;
-}}}}
+}
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/inc/databasecontext.hxx b/dbaccess/source/core/inc/databasecontext.hxx
index 209e44ce1c05..0c1848042b26 100644
--- a/dbaccess/source/core/inc/databasecontext.hxx
+++ b/dbaccess/source/core/inc/databasecontext.hxx
@@ -42,13 +42,13 @@
 #include <cppuhelper/compbase.hxx>
 
 // needed for registration
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang
     {
         class XMultiServiceFactory;
         class IllegalArgumentException;
     }
-} } }
+}
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index d70f4a199039..2edda8efd485 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -47,7 +47,7 @@ class SvTreeListBox;
 class TransferableHelper;
 class TransferableClipboardListener;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container {
         class XNameContainer;
         class XContainer;
@@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star {
     namespace ucb {
         class XContent;
     }
-}}}
+}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 75db4cb47cb3..1dd89d84a28a 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -34,9 +34,9 @@
 #include <vcl/graph.hxx>
 #include <vcl/GraphicObject.hxx>
 
-namespace com{ namespace sun { namespace star { namespace awt   { class XWindow; } } } }
-namespace com{ namespace sun { namespace star { namespace frame { class XFrame2; } } } }
-namespace com{ namespace sun { namespace star { namespace io    { class XPersist; } } } }
+namespace com::sun::star::awt   { class XWindow; }
+namespace com::sun::star::frame { class XFrame2; }
+namespace com::sun::star::io    { class XPersist; }
 
 #define ELEMENT_COUNT   size_t(E_ELEMENT_TYPE_COUNT)
 
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index febe987a319f..0d492953a5e4 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -27,7 +27,7 @@
 #include <IClipBoardTest.hxx>
 #include <AppElementType.hxx>
 
-namespace com{ namespace sun { namespace star { namespace beans    { class XPropertySet; } } } }
+namespace com::sun::star::beans    { class XPropertySet; }
 
 class Control;
 class SvTreeListEntry;
diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx
index 8b8db2792685..42887fd00e3d 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.hxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.hxx
@@ -33,7 +33,7 @@
 #define CONTAINER_QUERIES       sal_uLong( 0 )
 #define CONTAINER_TABLES        sal_uLong( 1 )
 
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 8a558ccae04c..09098e30a428 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -22,11 +22,11 @@
 #include <TableGrantCtrl.hxx>
 #include "adminpages.hxx"
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sdbc {
         class XConnection;
     }
-}}}
+}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index f14fbb38554e..fca471a84265 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -36,7 +36,7 @@
 #include "commontypes.hxx"
 #include "IUpdateHelper.hxx"
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt{
         struct FontDescriptor;
     }
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star {
         class XPreparedStatement;
         class XDatabaseMetaData;
     }
-}}}
+}
 
 #define COLUMN_POSITION_NOT_FOUND   (sal_Int32(-1))
 
diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx
index 2d8f42508696..8b0fe5f88278 100644
--- a/dbaccess/source/ui/inc/IItemSetHelper.hxx
+++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sdbc {
         class XConnection;
         class XDriver;
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star {
     namespace lang {
         class XMultiServiceFactory;
     }
-}}}
+}
 
 class SfxItemSet;
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index 135c1350e92a..2cb947a9fee8 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -26,14 +26,14 @@
 
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         class XPropertySet;
     }
     namespace uno {
         class XComponentContext;
     }
-}}}
+}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index ad5ef5cfb1e5..ecf8f9442e58 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -36,11 +36,11 @@
 #include <svx/dataaccessdescriptor.hxx>
 #include <vcl/weld.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sdbc{
         class XRowUpdate;
     }
-}}}
+}
 
 class SvStream;
 
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index b4ec36341a1d..0ea5b03c93c3 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -31,7 +31,7 @@
 #define RET_ALL     100
 
 // we only need forward decl here
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 
     namespace beans     { class XPropertySet;}
     namespace container
@@ -60,8 +60,7 @@ namespace com { namespace sun { namespace star {
     }
     namespace ucb { class XContent; }
     namespace uno { class XComponentContext; }
-
-}}}
+}
 
 namespace svt
 {
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 1c595513f649..b30f2cd95d91 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -24,14 +24,14 @@
 #include "IItemSetHelper.hxx"
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sdbc {
         class XConnection;
     }
     namespace lang {
         class XMultiServiceFactory;
     }
-}}}
+}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index 8ba0ae5dd8cb..82a7129f6985 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -25,11 +25,11 @@
 #include <dbaccess/dataview.hxx>
 #include <unotools/eventlisteneradapter.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     class XControl;
     class XControlContainer;
     class XControlModel;
-}}}}
+}
 
 class Splitter;
 
diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx
index 40cd3c4fb1d3..6562555e6f5c 100644
--- a/dbaccess/source/ui/inc/commontypes.hxx
+++ b/dbaccess/source/ui/inc/commontypes.hxx
@@ -24,11 +24,11 @@
 
 #include <unotools/sharedunocomponent.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sdbc {
         class XConnection;
     }
-} } }
+}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 4403f818efa8..f0c6ed6c7e71 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -25,7 +25,7 @@
 #include "IItemSetHelper.hxx"
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         class XPropertySet;
     }
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
     namespace lang {
         class XMultiServiceFactory;
     }
-}}}
+}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index 10d2c2feee2d..7ee0f5ca2cf2 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -26,9 +26,9 @@
 
 #include <rtl/ref.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index ffacf517bd4c..776d19b52ba8 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -25,7 +25,7 @@
 #include <vcl/wizardmachine.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         class XPropertySet;
     }
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
     namespace lang {
         class XMultiServiceFactory;
     }
-}}}
+}
 
 using vcl::WizardTypes::WizardState;
 using vcl::WizardTypes::CommitPageReason;
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index cc40eb25d17c..e204dc1f49ba 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -26,7 +26,7 @@
 #include <memory>
 #include <vcl/roadmapwizard.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         class XPropertySet;
     }
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
     namespace lang {
         class XMultiServiceFactory;
     }
-}}}
+}
 
 using vcl::WizardTypes::WizardState;
 using vcl::WizardTypes::CommitPageReason;
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index de0470737bb8..598cbfb7cc7f 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -25,11 +25,11 @@
 #include <vcl/weld.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sdbc {
         class XConnection;
     }
-}}}
+}
 
 enum class SADFlags {
     NONE                  = 0x0000,
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 629ea7c5087c..30fb9fa73112 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -36,11 +36,11 @@
 
 class SvNumberFormatter;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang {
         class XMultiServiceFactory;
     }
-}}}
+}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index 4bb1e8c9c113..8337ae398c64 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -25,9 +25,7 @@
 #include <svtools/editsyntaxhighlighter.hxx>
 #include <svtools/colorcfg.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans {
-    class XMultiPropertySet;
-} } } }
+namespace com::sun::star::beans { class XMultiPropertySet; }
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index 434250b39e41..ff80b962f52e 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -25,14 +25,14 @@
 #include <memory>
 
 // some forwards
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sdb {
         class SQLContext;
     }
     namespace sdbc {
         class SQLException;
     }
-} } }
+}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index e0674cd541ca..6ea21d08b52c 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -43,7 +43,7 @@ class SvTreeListEntry;
 class Splitter;
 struct SvSortData;
 
-namespace com { namespace sun{ namespace star { namespace container { class XNameContainer; } } } }
+namespace com::sun::star::container { class XNameContainer; }
 
 class SvTreeList;
 namespace dbaui
diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx
index 235639c31919..1d69e1ea2903 100644
--- a/dbaccess/source/ui/uno/ColumnControl.hxx
+++ b/dbaccess/source/ui/uno/ColumnControl.hxx
@@ -23,9 +23,7 @@
 #include <toolkit/controls/unocontrol.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index bbe509eab2fc..66e0bfb164f5 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -31,9 +31,7 @@
 #include <com/sun/star/sdb/ParametersRequest.hpp>
 #include <com/sun/star/sdb/DocumentSaveRequest.hpp>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dbtools
 {