7 files changed, 24 insertions, 42 deletions
diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx
index 3a87dca71acb..437523370d27 100644
--- a/xmlsecurity/inc/certificatechooser.hxx
+++ b/xmlsecurity/inc/certificatechooser.hxx
@@ -23,14 +23,12 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <vcl/weld.hxx>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace security {
-    class XCertificate; }
-namespace xml { namespace crypto {
-    class XSecurityEnvironment; }}
-}}}
+namespace com::sun::star {
+    namespace security { class XCertificate; }
+    namespace xml::crypto {
+        class XSecurityEnvironment;
+    }
+}
 
 namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
 
diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx
index 5d6473de16ff..719db4764520 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -22,14 +22,10 @@
 
 #include <vcl/weld.hxx>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace security {
-    class XCertificate; }
-namespace xml { namespace crypto {
-    class XSecurityEnvironment; }}
-}}}
+namespace com::sun::star {
+    namespace security { class XCertificate; }
+    namespace xml::crypto { class XSecurityEnvironment; }
+}
 
 class CertificateViewerGeneralTP;
 class CertificateViewerDetailsTP;
diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx
index d035d64c528f..6497a633786d 100644
--- a/xmlsecurity/inc/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx
@@ -29,18 +29,12 @@
 
 #include <vector>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace lang {
-    class XMultiServiceFactory; }
-namespace io {
-    class XStream; }
-namespace embed {
-    class XStorage; }
-namespace xml { namespace dom {
-    class XDocumentBuilder; } }
-}}}
+namespace com::sun::star {
+    namespace lang { class XMultiServiceFactory; }
+    namespace io { class XStream; }
+    namespace embed { class XStorage; }
+    namespace xml::dom { class XDocumentBuilder; }
+}
 
 
 class HeaderBar;
diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx
index ef17e3b20efe..49ea1edcb49c 100644
--- a/xmlsecurity/inc/macrosecurity.hxx
+++ b/xmlsecurity/inc/macrosecurity.hxx
@@ -23,13 +23,7 @@
 #include <vcl/weld.hxx>
 #include <unotools/securityoptions.hxx>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace xml { namespace crypto {
-    class XSecurityEnvironment; }}
-}}}
-
+namespace com::sun::star::xml::crypto { class XSecurityEnvironment; }
 class MacroSecurityTP;
 
 class MacroSecurity final : public weld::GenericDialogController
diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 0fcbd665251f..2437686ea31b 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -41,11 +41,11 @@ namespace embed {
     class XStorage; }
 }}}
 
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLSecurityContext; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XWriter; } } } } }
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
+namespace com::sun::star::xml::sax { class XDocumentHandler; }
+namespace com::sun::star::xml::sax { class XWriter; }
 
 /**********************************************************
  XMLSignatureHelper
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index eed8b9782870..324f1c43388b 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -64,7 +64,7 @@ namespace com::sun::star::xml::sax { class XDocumentHandler; }
 class XMLDocumentWrapper_XmlSecImpl;
 class SAXEventKeeperImpl;
 class XMLSignatureHelper;
-namespace svl { namespace crypto { enum class SignatureMethodAlgorithm; } }
+namespace svl::crypto { enum class SignatureMethodAlgorithm; }
 
 class InternalSignatureInformation
 {
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 9bc2a4f0236b..117e2c2945f2 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -39,7 +39,7 @@
 
 #include <xmlsec-wrapper.h>
 
-namespace com { namespace sun { namespace star { namespace security { class XCertificate; } } } }
+namespace com::sun::star::security { class XCertificate; }
 class X509Certificate_NssImpl;
 
 class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper<