compact namespace in xmlhelp..xmlsecurity

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

29 files changed, 71 insertions, 73 deletions

diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index cf73d6e7d608..dcdd16819083 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -26,15 +26,15 @@
 // forward declarations
 
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace dom {
+namespace com::sun::star {
+    namespace xml::dom {
         class XNode;
         class XDocument;
-    } }
-    namespace xml { namespace sax {
+    }
+    namespace xml::sax {
         class XAttributeList;
-    } }
-} } }
+    }
+}
 class SvXMLImport;
 class SvXMLImportContext;
 
diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx
index 47745940cf63..c9d6d76db4f7 100644
--- a/xmloff/inc/DomExport.hxx
+++ b/xmloff/inc/DomExport.hxx
@@ -23,11 +23,11 @@
 #include <com/sun/star/uno/Reference.hxx>
 
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<typename T> class Reference; }
-    namespace xml { namespace dom { class XDocument; } }
-    namespace xml { namespace dom { class XNode; } }
-} } }
+    namespace xml::dom { class XDocument; }
+    namespace xml::dom { class XNode; }
+}
 
 void exportDom( SvXMLExport&, const css::uno::Reference<css::xml::dom::XDocument>& );
 
diff --git a/xmloff/inc/EnhancedCustomShapeToken.hxx b/xmloff/inc/EnhancedCustomShapeToken.hxx
index 92e200333dbc..008387787f93 100644
--- a/xmloff/inc/EnhancedCustomShapeToken.hxx
+++ b/xmloff/inc/EnhancedCustomShapeToken.hxx
@@ -22,7 +22,7 @@
 
 #include <rtl/ustring.hxx>
 
-namespace xmloff { namespace EnhancedCustomShapeToken {
+namespace xmloff::EnhancedCustomShapeToken {
 
     enum EnhancedCustomShapeTokenEnum
     {
@@ -156,7 +156,7 @@ namespace xmloff { namespace EnhancedCustomShapeToken {
     EnhancedCustomShapeTokenEnum EASGet( const OUString& );
     OUString EASGet( const EnhancedCustomShapeTokenEnum );
 }
-}
+
 
 #endif
 
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index 7744c907c72c..ee996422e2e3 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -24,11 +24,11 @@
 #include <memory>
 
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XMultiPropertySet; }
     namespace beans { class XPropertySet; }
     namespace beans { class XPropertySetInfo; }
-} } }
+}
 
 
 /**
diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx
index 2b79a040a86d..a5d49c513347 100644
--- a/xmloff/inc/RDFaExportHelper.hxx
+++ b/xmloff/inc/RDFaExportHelper.hxx
@@ -27,11 +27,11 @@
 #include <map>
 
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace rdf { class XBlankNode; }
     namespace rdf { class XMetadatable; }
     namespace rdf { class XDocumentRepository; }
-} } }
+}
 
 class SvXMLExport;
 
diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx
index 7242d3fdcc1f..9cda7c29dcf0 100644
--- a/xmloff/inc/RDFaImportHelper.hxx
+++ b/xmloff/inc/RDFaImportHelper.hxx
@@ -26,11 +26,11 @@
 #include <com/sun/star/uno/Reference.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { class XComponentContext; }
     namespace rdf { class XMetadatable; }
     namespace rdf { class XRepositorySupplier; }
-} } }
+}
 
 class SvXMLImport;
 
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 7a94f4df253c..c5b8b3c59fd2 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -24,11 +24,11 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlprmap.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace task {
         class XStatusIndicator;
     }
-}}}
+}
 
 // export class for a complete chart document
 
diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx
index eedac509e1fb..6a1174c419d8 100644
--- a/xmloff/inc/TransGradientStyle.hxx
+++ b/xmloff/inc/TransGradientStyle.hxx
@@ -25,11 +25,11 @@
 
 class SvXMLImport;
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<class A> class Reference; }
-    namespace xml { namespace sax { class XAttributeList; } }
+    namespace xml::sax { class XAttributeList; }
     namespace uno { class Any; }
-} } }
+}
 
 
 class XMLTransGradientStyleImport
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index 402e28291da6..02152f1503d2 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -23,9 +23,9 @@
 #include <com/sun/star/style/GraphicLocation.hpp>
 #include "XMLElementPropertyContext.hxx"
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XOutputStream; }
-} } }
+}
 
 class XMLBackgroundImageContext final : public XMLElementPropertyContext
 {
diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx
index 222f875a709b..a186399df7cd 100644
--- a/xmloff/inc/XMLBackgroundImageExport.hxx
+++ b/xmloff/inc/XMLBackgroundImageExport.hxx
@@ -23,9 +23,9 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class Any;
-} } } }
+}
 
 class SvXMLExport;
 
diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx
index be5e62b48f4c..1c248dbd4638 100644
--- a/xmloff/inc/XMLBase64Export.hxx
+++ b/xmloff/inc/XMLBase64Export.hxx
@@ -22,8 +22,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <xmloff/xmltoken.hxx>
 
-namespace com { namespace sun { namespace star { namespace io {
-    class XInputStream; } } } }
+namespace com::sun::star::io { class XInputStream; }
 class SvXMLExport;
 
 class XMLBase64Export
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index e3782f47dcaf..029dfd45815e 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -23,8 +23,7 @@
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xmloff/xmlictxt.hxx>
 
-namespace com { namespace sun { namespace star { namespace lang {
-    class XComponent; } } } }
+namespace com::sun::star::lang { class XComponent; }
 
 class XMLEmbeddedObjectImportContext final : public SvXMLImportContext
 {
diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx
index ddc696b3d772..d2514ebe46b6 100644
--- a/xmloff/inc/XMLEventImportHelper.hxx
+++ b/xmloff/inc/XMLEventImportHelper.hxx
@@ -28,9 +28,9 @@
 #include <memory>
 
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XAttributeList; }
+}
 class XMLEventContextFactory;
 class XMLEventsImportContext;
 struct XMLEventNameTranslation;
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index 3fa5e47e6cea..5cbae1fda6d6 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -23,11 +23,11 @@
 #include <memory>
 #include <xmloff/xmlstyle.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<class X> class Reference; }
-    namespace xml { namespace sax { class XAttributeList; } }
+    namespace xml::sax { class XAttributeList; }
     namespace beans { class XPropertySet; }
-} } }
+}
 class SvXMLImport;
 
 /// import footnote and endnote configuration elements
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index f1fc133cc4b0..8421e0da5fc4 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -24,11 +24,11 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XIndexContainer; }
     namespace beans { class XPropertySet; }
-    namespace xml { namespace sax { class XAttributeList; } }
-} } }
+    namespace xml::sax { class XAttributeList; }
+}
 
 
 class XMLImageMapContext final : public SvXMLImportContext
diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx
index 3504d31a5b0e..43d80cc12412 100644
--- a/xmloff/inc/XMLImageMapExport.hxx
+++ b/xmloff/inc/XMLImageMapExport.hxx
@@ -22,11 +22,11 @@
 
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<class X> class Reference; }
     namespace beans { class XPropertySet; }
     namespace container { class XIndexContainer; }
-} } }
+}
 class SvXMLExport;
 
 
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index 467ecbd19d8b..e2f67f9ad495 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -30,9 +30,9 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XAttributeList; }
+}
 
 
 /**
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index 6b6dc74b87b8..90f7831b672e 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -24,9 +24,9 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XAttributeList; }
+}
 
 
 enum LineNumberingToken
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 52bc2e0da68d..83bc128ba199 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -23,9 +23,10 @@
 #include <xmloff/xmlictxt.hxx>
 
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { class XPropertySet; }
-    namespace io { class XOutputStream; } } } }
+    namespace io { class XOutputStream; }
+}
 
 class XMLReplacementImageContext final : public SvXMLImportContext
 {
diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx
index de0eed0a67e1..cd4ade05b848 100644
--- a/xmloff/inc/XMLScriptContextFactory.hxx
+++ b/xmloff/inc/XMLScriptContextFactory.hxx
@@ -24,9 +24,9 @@
 #include <xmloff/xmlevent.hxx>
 
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XAttributeList; }
+}
 class SvXMLImport;
 class XMLEventsImportContext;
 
diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index 05cc4d9f827a..57390edd3bf5 100644
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
@@ -25,9 +25,9 @@
 #include <xmloff/xmlevent.hxx>
 
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
-} } }
+}
 
 class XMLScriptExportHandler final : public XMLEventExportHandler
 {
diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx
index b000a9f9c728..12daf023b065 100644
--- a/xmloff/inc/XMLStarBasicContextFactory.hxx
+++ b/xmloff/inc/XMLStarBasicContextFactory.hxx
@@ -24,9 +24,9 @@
 #include <xmloff/xmlevent.hxx>
 
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XAttributeList; }
+}
 class SvXMLImport;
 class XMLEventsImportContext;
 
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index 2e7f519d345f..188006dd6f69 100644
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
@@ -25,9 +25,9 @@
 #include <xmloff/xmlevent.hxx>
 
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
-} } }
+}
 
 class XMLStarBasicExportHandler final : public XMLEventExportHandler
 {
diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx
index 5662edccbd0d..a21f96125ff9 100644
--- a/xmloff/inc/XMLTextColumnsExport.hxx
+++ b/xmloff/inc/XMLTextColumnsExport.hxx
@@ -21,8 +21,7 @@
 
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class Any; } } } }
+namespace com::sun::star::uno { class Any; }
 class SvXMLExport;
 
 class XMLTextColumnsExport
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 8cdd2c739d53..2a251b8fd37e 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -22,10 +22,10 @@
 
 #include <xmloff/xmlictxt.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace text { class XTextCursor; }
     namespace beans { class XPropertySet; }
-} } }
+}
 
 class XMLTextHeaderFooterContext final : public SvXMLImportContext
 {
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 3c473e36da36..c97d278dc953 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -26,10 +26,10 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang { class XMultiServiceFactory; }
     namespace uno { class XInterface; }
-} } }
+}
 
 // chart OOo export
 OUString SchXMLExport_Content_getImplementationName() throw();
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index b4dfed383280..63a6e0351671 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -38,7 +38,7 @@
 class SvXMLExport;
 struct XMLPropertyState;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace util { struct DateTime; }
     namespace util { struct Date; }
     namespace text { class XTextField; }
@@ -47,7 +47,7 @@ namespace com { namespace sun { namespace star {
     namespace beans { class XPropertySetInfo; }
     namespace frame { class XModel; }
     namespace uno { template<typename A> class Sequence; }
-} } }
+}
 
 
 /// field IDs,
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 94d0c6ce5cbf..d5aee115d4d9 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -36,11 +36,11 @@
 #include <rtl/ustrbuf.hxx>
 #include <vector>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+    namespace xml::sax { class XAttributeList; }
     namespace text { class XTextField; }
     namespace beans { class XPropertySet; struct PropertyValue; }
-} } }
+}
 
 class SvXMLImport;
 class XMLTextImportHelper;
diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmltabe.hxx
index 19d55234517c..0023490e299f 100644
--- a/xmloff/inc/xmltabe.hxx
+++ b/xmloff/inc/xmltabe.hxx
@@ -25,10 +25,10 @@
 #include <sal/types.h>
 
 class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace style { struct TabStop; }
     namespace uno { class Any; }
-} } }
+}
 
 
 class SvxXMLTabStopExport final