compact namespace in sw

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

7 files changed, 9 insertions, 19 deletions

diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index e3662fdf9da2..dc0873af000e 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -23,7 +23,7 @@
 #include <swdbdata.hxx>
 #include <sharedconnection.hxx>
 
-namespace com{namespace sun{namespace star{
+namespace com::sun::star{
     namespace container{
         class XNameAccess;
     }
@@ -36,7 +36,7 @@ namespace com{namespace sun{namespace star{
     namespace sdbcx{
         class XColumnsSupplier;
     }
-}}}
+}
 class SwMailMergeAddressBlockPage;
 
 struct AddressUserData_Impl;
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index ec2c58d92bf3..f914ea2bde58 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -22,10 +22,10 @@
 #include <sfx2/basedlgs.hxx>
 #include <com/sun/star/uno/Sequence.h>
 
-namespace com{ namespace sun{ namespace star{
+namespace com::sun::star{
     namespace beans{  struct PropertyValue; }
     namespace frame{ class XFrame2;     }
-    }}}
+}
 
 class SwDBTablePreviewDialog : public SfxDialogController
 {
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 6bacb3c5518c..a0f732e8af28 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -29,7 +29,7 @@ class SwOneExampleFrame;
 class SwWrtShell;
 class SwView;
 
-namespace com{ namespace sun{ namespace star{ namespace beans{ class XPropertySet;}}}}
+namespace com::sun::star::beans{ class XPropertySet;}
 
 class SwMailMergeLayoutPage : public vcl::OWizardPage
 {
diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx
index 4c4acfcc167d..852a7570d285 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.hxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.hxx
@@ -21,11 +21,7 @@
 
 #include <sfx2/basedlgs.hxx>
 
-namespace com{namespace sun{namespace star{
-    namespace sdbc{
-        class XConnection;
-    }
-}}}
+namespace com::sun::star::sdbc { class XConnection; }
 
 class SwSelectDBTableDialog : public SfxDialogController
 {
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 826f5b562627..fb6fffff8036 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -23,9 +23,7 @@
 #include <numfmtlb.hxx>
 #include "fldpage.hxx"
 
-namespace com{namespace sun{ namespace star{ namespace beans{
-    class XPropertySet;
-}}}}
+namespace com::sun::star::beans { class XPropertySet; }
 
 class SwFieldDokInfPage : public SwFieldPage
 {
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 324ee3b7931f..4db8e0e766f4 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -28,12 +28,8 @@
 class SwMailMergeWizard;
 class SfxPrinter;
 class SwSendMailDialog;
+namespace com::sun::star::mail { class XMailMessage; }
 
-namespace com{ namespace sun{ namespace star{
-    namespace mail{
-        class XMailMessage;
-    }
-}}}
 
 /// Dialog implementing the saving as of the result document.
 class SwMMResultSaveDialog : public SfxDialogController
diff --git a/sw/source/ui/vba/service.hxx b/sw/source/ui/vba/service.hxx
index eee1f816410d..3ed37ff0ffe5 100644
--- a/sw/source/ui/vba/service.hxx
+++ b/sw/source/ui/vba/service.hxx
@@ -12,7 +12,7 @@
 
 #include <sal/config.h>
 
-namespace comphelper { namespace service_decl { class ServiceDecl; } }
+namespace comphelper::service_decl { class ServiceDecl; }
 
 namespace document {
 extern comphelper::service_decl::ServiceDecl const serviceDecl;