xmlhelp/source/cxxhelp/provider/content.hxx | 9 ++---
xmloff/inc/DomBuilderContext.hxx | 12 +++---
xmloff/inc/DomExport.hxx | 8 ++--
xmloff/inc/EnhancedCustomShapeToken.hxx | 4 +-
xmloff/inc/MultiPropertySetHelper.hxx | 4 +-
xmloff/inc/RDFaExportHelper.hxx | 4 +-
xmloff/inc/RDFaImportHelper.hxx | 4 +-
xmloff/inc/SchXMLExport.hxx | 4 +-
xmloff/inc/TransGradientStyle.hxx | 6 +--
xmloff/inc/XMLBackgroundImageContext.hxx | 4 +-
xmloff/inc/XMLBackgroundImageExport.hxx | 4 +-
xmloff/inc/XMLBase64Export.hxx | 3 -
xmloff/inc/XMLEmbeddedObjectImportContext.hxx | 3 -
xmloff/inc/XMLEventImportHelper.hxx | 6 +--
xmloff/inc/XMLFootnoteConfigurationImportContext.hxx | 6 +--
xmloff/inc/XMLImageMapContext.hxx | 6 +--
xmloff/inc/XMLImageMapExport.hxx | 4 +-
xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx | 6 +--
xmloff/inc/XMLLineNumberingImportContext.hxx | 6 +--
xmloff/inc/XMLReplacementImageContext.hxx | 5 +-
xmloff/inc/XMLScriptContextFactory.hxx | 6 +--
xmloff/inc/XMLScriptExportHandler.hxx | 4 +-
xmloff/inc/XMLStarBasicContextFactory.hxx | 6 +--
xmloff/inc/XMLStarBasicExportHandler.hxx | 4 +-
xmloff/inc/XMLTextColumnsExport.hxx | 3 -
xmloff/inc/XMLTextHeaderFooterContext.hxx | 4 +-
xmloff/inc/facreg.hxx | 4 +-
xmloff/inc/txtflde.hxx | 4 +-
xmloff/inc/txtfldi.hxx | 6 +--
xmloff/inc/xmltabe.hxx | 4 +-
xmloff/source/chart/SchXMLChartContext.hxx | 8 ++--
xmloff/source/chart/SchXMLParagraphContext.hxx | 4 +-
xmloff/source/chart/SchXMLPlotAreaContext.hxx | 7 ++-
xmloff/source/chart/SchXMLPropertyMappingContext.hxx | 4 +-
xmloff/source/chart/SchXMLSeries2Context.hxx | 4 +-
xmloff/source/chart/SchXMLTableContext.hxx | 9 ++---
xmloff/source/chart/SchXMLTextListContext.hxx | 4 +-
xmloff/source/chart/SchXMLTools.hxx | 4 +-
xmloff/source/chart/XMLSymbolImageContext.hxx | 4 +-
xmloff/source/chart/contexts.hxx | 4 +-
xmloff/source/draw/ximpcustomshape.hxx | 6 +--
xmloff/source/forms/property_meta_data.hxx | 4 +-
xmloff/source/forms/propertyimport.hxx | 4 +-
xmloff/source/style/XMLFontStylesContext_impl.hxx | 4 +-
xmloff/source/style/XMLFootnoteSeparatorImport.hxx | 6 +--
xmloff/source/text/XMLAutoMarkFileContext.hxx | 6 +--
xmloff/source/text/XMLAutoTextContainerEventImport.hxx | 6 +--
xmloff/source/text/XMLAutoTextEventExport.hxx | 6 +--
xmloff/source/text/XMLAutoTextEventImport.hxx | 6 +--
xmloff/source/text/XMLChangeElementImportContext.hxx | 8 ++--
xmloff/source/text/XMLChangeImportContext.hxx | 8 ++--
xmloff/source/text/XMLChangeInfoContext.hxx | 6 +--
xmloff/source/text/XMLChangedRegionImportContext.hxx | 8 ++--
xmloff/source/text/XMLFootnoteBodyImportContext.hxx | 8 ++--
xmloff/source/text/XMLFootnoteImportContext.hxx | 8 ++--
xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx | 6 +--
xmloff/source/text/XMLIndexBibliographyEntryContext.hxx | 6 +--
xmloff/source/text/XMLIndexBibliographySourceContext.hxx | 6 +--
xmloff/source/text/XMLIndexBodyContext.hxx | 6 +--
xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx | 6 +--
xmloff/source/text/XMLIndexIllustrationSourceContext.hxx | 6 +--
xmloff/source/text/XMLIndexMarkExport.hxx | 4 +-
xmloff/source/text/XMLIndexObjectSourceContext.hxx | 6 +--
xmloff/source/text/XMLIndexSimpleEntryContext.hxx | 6 +--
xmloff/source/text/XMLIndexSourceBaseContext.hxx | 6 +--
xmloff/source/text/XMLIndexSpanEntryContext.hxx | 6 +--
xmloff/source/text/XMLIndexTOCContext.hxx | 6 +--
xmloff/source/text/XMLIndexTOCSourceContext.hxx | 6 +--
xmloff/source/text/XMLIndexTOCStylesContext.hxx | 6 +--
xmloff/source/text/XMLIndexTabStopEntryContext.hxx | 6 +--
xmloff/source/text/XMLIndexTableSourceContext.hxx | 6 +--
xmloff/source/text/XMLIndexTemplateContext.hxx | 6 +--
xmloff/source/text/XMLIndexTitleTemplateContext.hxx | 6 +--
xmloff/source/text/XMLIndexUserSourceContext.hxx | 6 +--
xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx | 6 +--
xmloff/source/text/XMLPropertyBackpatcher.hxx | 4 +-
xmloff/source/text/XMLRedlineExport.hxx | 4 +-
xmloff/source/text/XMLSectionExport.hxx | 4 +-
xmloff/source/text/XMLSectionFootnoteConfigImport.hxx | 6 +--
xmloff/source/text/XMLSectionImportContext.hxx | 6 +--
xmloff/source/text/XMLSectionSourceDDEImportContext.hxx | 6 +--
xmloff/source/text/XMLSectionSourceImportContext.hxx | 6 +--
xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx | 4 +-
xmloff/source/text/XMLTextFrameContext.hxx | 4 +-
xmloff/source/text/XMLTextFrameHyperlinkContext.hxx | 4 +-
xmloff/source/text/XMLTextMarkImportContext.hxx | 8 ++--
xmloff/source/text/XMLTextNumRuleInfo.hxx | 4 +-
xmloff/source/text/XMLTrackedChangesImportContext.hxx | 8 ++--
xmloff/source/text/txtdrope.hxx | 3 -
xmloff/source/text/txtparai.hxx | 8 ++--
xmloff/source/transform/TransformerBase.hxx | 4 +-
xmloff/source/xforms/SchemaContext.hxx | 6 +--
xmloff/source/xforms/SchemaRestrictionContext.hxx | 6 +--
xmloff/source/xforms/SchemaSimpleTypeContext.hxx | 6 +--
xmloff/source/xforms/TokenContext.hxx | 6 +--
xmloff/source/xforms/XFormsBindContext.hxx | 6 +--
xmloff/source/xforms/XFormsInstanceContext.hxx | 8 ++--
xmloff/source/xforms/XFormsModelContext.hxx | 6 +--
xmloff/source/xforms/XFormsModelExport.hxx | 4 +-
xmloff/source/xforms/XFormsSubmissionContext.hxx | 6 +--
xmloff/source/xforms/xformsapi.hxx | 4 +-
xmlscript/source/inc/unoservices.hxx | 4 +-
xmlsecurity/inc/certificatechooser.hxx | 14 +++----
xmlsecurity/inc/certificateviewer.hxx | 12 ++----
xmlsecurity/inc/digitalsignaturesdialog.hxx | 18 +++-------
xmlsecurity/inc/macrosecurity.hxx | 8 ----
xmlsecurity/inc/xmlsignaturehelper.hxx | 10 ++---
xmlsecurity/inc/xsecctl.hxx | 2 -
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 2 -
109 files changed, 304 insertions(+), 324 deletions(-)
New commits:
commit 12903057343f5d909e400fe778280a1c320923a6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun May 10 09:20:21 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 10 13:56:07 2020 +0200
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.gran...@collabora.co.uk>
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx
b/xmlhelp/source/cxxhelp/provider/content.hxx
index b16c56efa2f3..fe372e1fd4f4 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -24,14 +24,13 @@
#include "urlparameter.hxx"
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct Property;
struct PropertyValue;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace sdbc {
+}
+namespace com::sun::star::sdbc {
class XRow;
-} } } }
+}
namespace chelp
{
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
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx
b/xmloff/source/chart/SchXMLChartContext.hxx
index 26f38d0bf9ec..ae99d92fa2f6 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -30,18 +30,18 @@
class SchXMLImportHelper;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace chart {
class XChartDocument;
struct ChartSeriesAddress;
}
- namespace xml { namespace sax {
+ namespace xml::sax {
class XAttributeList;
- }}
+ }
namespace drawing {
class XShapes;
}
-}}}
+}
struct SeriesDefaultsAndStyles
{
diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx
b/xmloff/source/chart/SchXMLParagraphContext.hxx
index fade1b355317..655e7e33bd08 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -23,9 +23,9 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-namespace com { namespace sun { namespace star { namespace xml { namespace sax
{
+namespace com::sun::star::xml::sax {
class XAttributeList;
-}}}}}
+}
class SchXMLParagraphContext : public SvXMLImportContext
{
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 0dc789028b43..1541c4ef6788 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -31,7 +31,7 @@
class SvXMLImport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace chart {
class XDiagram;
class X3DDisplay;
@@ -40,9 +40,10 @@ namespace com { namespace sun { namespace star {
namespace chart2 {
class XChartDocument;
}
- namespace xml { namespace sax {
+ namespace xml::sax {
class XAttributeList;
-}}}}}
+ }
+}
class SchXML3DSceneAttributesHelper : public SdXML3DSceneAttributesHelper
{
diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
index 127c259b748e..4206ed91193c 100644
--- a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
+++ b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
@@ -14,12 +14,12 @@
#include <xmloff/xmlictxt.hxx>
#include <xmloff/SchXMLImportHelper.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace chart2 {
class XChartDocument;
class XDataSeries;
}
-}}}
+}
class SchXMLPropertyMappingContext : public SvXMLImportContext
{
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx
b/xmloff/source/chart/SchXMLSeries2Context.hxx
index 5deb9db8764a..7f825974e9a6 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -27,7 +27,7 @@
#include <vector>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace chart2 {
class XChartDocument;
class XDataSeries;
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
namespace awt {
struct Size;
}
-}}}
+}
// class for child contexts: series, data point and statistics objects
class SchXMLSeries2Context : public SvXMLImportContext
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx
b/xmloff/source/chart/SchXMLTableContext.hxx
index c633a37f7966..f0293195d6ae 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -27,13 +27,14 @@
#include "transporttypes.hxx"
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax {
+namespace com::sun::star {
+ namespace xml::sax {
class XAttributeList;
- }}
+ }
namespace chart {
class XChartDocument;
-}}}}
+ }
+}
class SchXMLTableContext : public SvXMLImportContext
{
diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx
b/xmloff/source/chart/SchXMLTextListContext.hxx
index 4c2c6c9c38cc..2b15c17c6192 100644
--- a/xmloff/source/chart/SchXMLTextListContext.hxx
+++ b/xmloff/source/chart/SchXMLTextListContext.hxx
@@ -23,9 +23,9 @@
#include <rtl/ustring.hxx>
#include <vector>
-namespace com { namespace sun { namespace star { namespace xml { namespace sax
{
+namespace com::sun::star::xml::sax {
class XAttributeList;
-}}}}}
+}
class SchXMLTextListContext : public SvXMLImportContext
{
diff --git a/xmloff/source/chart/SchXMLTools.hxx
b/xmloff/source/chart/SchXMLTools.hxx
index d8f16eda480c..f57b41713ae1 100644
--- a/xmloff/source/chart/SchXMLTools.hxx
+++ b/xmloff/source/chart/SchXMLTools.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace chart2 {
class XChartDocument;
class XRegressionCurve;
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star {
class XDataProvider;
}
}
-}}}
+}
class XMLPropStyleContext;
class SvXMLStylesContext;
diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx
b/xmloff/source/chart/XMLSymbolImageContext.hxx
index 960a30aeb386..14f87879e7a0 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.hxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.hxx
@@ -21,9 +21,9 @@
#include <XMLElementPropertyContext.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XOutputStream; }
-} } }
+}
class XMLSymbolImageContext : public XMLElementPropertyContext
{
diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index 84cfef57b974..7cfcf2d5f44c 100644
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -24,9 +24,9 @@
#include <xmloff/xmlmetai.hxx>
-namespace com { namespace sun { namespace star { namespace xml { namespace sax
{
+namespace com::sun::star::xml::sax {
class XAttributeList;
-}}}}}
+}
/*
These contexts are only needed by
diff --git a/xmloff/source/draw/ximpcustomshape.hxx
b/xmloff/source/draw/ximpcustomshape.hxx
index da9a9d7613e3..aa662f176069 100644
--- a/xmloff/source/draw/ximpcustomshape.hxx
+++ b/xmloff/source/draw/ximpcustomshape.hxx
@@ -29,11 +29,11 @@
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/drawing/XShape.hpp>
-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 XMLEnhancedCustomShapeContext : public SvXMLImportContext
{
diff --git a/xmloff/source/forms/property_meta_data.hxx
b/xmloff/source/forms/property_meta_data.hxx
index 5f2b16657e8f..612f36e6c9e5 100644
--- a/xmloff/source/forms/property_meta_data.hxx
+++ b/xmloff/source/forms/property_meta_data.hxx
@@ -22,7 +22,7 @@
#include "property_description.hxx"
-namespace xmloff { namespace metadata
+namespace xmloff::metadata
{
const PropertyDescription* getPropertyDescription( const OUString&
i_propertyName );
@@ -39,7 +39,7 @@ namespace xmloff { namespace metadata
AttributeDescription
getAttributeDescription( const sal_uInt16 i_namespacePrefix, const
OUString& i_attributeName );
-} } // namespace xmloff::metadata
+} // namespace xmloff::metadata
#endif // INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_META_DATA_HXX
diff --git a/xmloff/source/forms/propertyimport.hxx
b/xmloff/source/forms/propertyimport.hxx
index 2f8718c6e6e3..f17501fc9f63 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -30,10 +30,10 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include "layerimport.hxx"
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
struct Time;
struct Date;
-} } } }
+}
namespace xmloff
{
diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx
b/xmloff/source/style/XMLFontStylesContext_impl.hxx
index e1baa2dd1ed0..2d7880389391 100644
--- a/xmloff/source/style/XMLFontStylesContext_impl.hxx
+++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx
@@ -22,9 +22,9 @@
#include <xmloff/xmlstyle.hxx>
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
class XOutputStream;
-} } } }
+}
/// Handles <style:font-face>
class XMLFontStyleContextFontFace : public SvXMLStyleContext
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
index 375b90826c27..b17d6927dd17 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
@@ -28,10 +28,10 @@
class SvXMLImport;
struct XMLPropertyState;
class XMLPropertySetMapper;
-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; }
+}
/**
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx
b/xmloff/source/text/XMLAutoMarkFileContext.hxx
index 71d00fcb84f9..0bb621d59bfb 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.hxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx
@@ -23,11 +23,11 @@
#include <xmloff/xmlictxt.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno { template<class X> class Reference; }
namespace beans { class XPropertySet; }
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+ namespace xml::sax { class XAttributeList; }
+}
class XMLAutoMarkFileContext : public SvXMLImportContext
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
index 686e9b0cd3d6..1910c301f423 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
@@ -24,10 +24,10 @@
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace container { class XNameReplace; }
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+ namespace xml::sax { class XAttributeList; }
+}
/**
diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx
b/xmloff/source/text/XMLAutoTextEventExport.hxx
index 890eafaa771f..8135ad81b6f0 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
@@ -23,7 +23,7 @@
#include <xmloff/xmlexp.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace container { class XNameAccess; }
namespace frame { class XModel; }
namespace lang { class XMultiServiceFactory; }
@@ -31,8 +31,8 @@ namespace com { namespace sun { namespace star {
namespace uno { template<class X> class Sequence; }
namespace uno { class XInterface; }
namespace uno { class Exception; }
- namespace xml { namespace sax { class XDocumentHandler; } }
-} } }
+ namespace xml::sax { class XDocumentHandler; }
+}
/**
diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx
b/xmloff/source/text/XMLAutoTextEventImport.hxx
index bc612eaae234..8dd605e3661c 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.hxx
@@ -25,15 +25,15 @@
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace frame { class XModel; }
namespace text { class XAutoTextContainer; }
namespace text { class XAutoTextGroup; }
namespace text { class XAutoTextEntry; }
namespace uno { template<class X> class Reference; }
namespace uno { template<class X> class Sequence; }
- namespace xml { namespace sax { class XDocumentHandler; } }
-} } }
+ namespace xml::sax { class XDocumentHandler; }
+}
class XMLAutoTextEventImport : public SvXMLImport
diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx
b/xmloff/source/text/XMLChangeElementImportContext.hxx
index f1fe47ef2e99..99ba062c6339 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.hxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.hxx
@@ -25,11 +25,11 @@
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax {
+namespace com::sun::star {
+ namespace xml::sax {
class XAttributeList;
- } }
-} } }
+ }
+}
class XMLChangedRegionImportContext;
diff --git a/xmloff/source/text/XMLChangeImportContext.hxx
b/xmloff/source/text/XMLChangeImportContext.hxx
index a2e88e809ae7..4f6f4de65187 100644
--- a/xmloff/source/text/XMLChangeImportContext.hxx
+++ b/xmloff/source/text/XMLChangeImportContext.hxx
@@ -25,11 +25,11 @@
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax {
+namespace com::sun::star {
+ namespace xml::sax {
class XAttributeList;
- } }
-} } }
+ }
+}
/**
diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx
b/xmloff/source/text/XMLChangeInfoContext.hxx
index 1e0cf5b9daa3..557ebdad2d64 100644
--- a/xmloff/source/text/XMLChangeInfoContext.hxx
+++ b/xmloff/source/text/XMLChangeInfoContext.hxx
@@ -26,9 +26,9 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
+}
class XMLChangedRegionImportContext;
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx
b/xmloff/source/text/XMLChangedRegionImportContext.hxx
index c82712c5b6f6..629a3090f7cd 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.hxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx
@@ -25,14 +25,14 @@
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text {
class XTextCursor;
}
- namespace xml { namespace sax {
+ namespace xml::sax {
class XAttributeList;
- } }
-} } }
+ }
+}
/**
* Import <text:changed-region> elements contained in a
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
index 56fb359bb244..647867a5cdcf 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax {
+namespace com::sun::star {
+ namespace xml::sax {
class XAttributeList;
- } }
-} } }
+ }
+}
/// import foot- and endnote body elements (<text:footnote-body>)
diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx
b/xmloff/source/text/XMLFootnoteImportContext.hxx
index 0a6d8ce40b82..b499e5831757 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.hxx
@@ -24,15 +24,15 @@
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text {
class XTextCursor;
class XFootnote;
}
- namespace xml { namespace sax {
+ namespace xml::sax {
class XAttributeList;
- } }
-} } }
+ }
+}
class XMLTextImportHelper;
/// import footnote elements (<text:footnote>)
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
index cdf0894b65d8..aa640d1f4fb3 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
@@ -25,10 +25,10 @@
#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; }
namespace beans { class XPropertySet; }
-} } }
+}
/**
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
index 3be35668f814..e2fd7e108e9b 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
@@ -26,9 +26,9 @@
#include <com/sun/star/beans/PropertyValue.hpp>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
+}
class XMLIndexTemplateContext;
template<typename EnumT> struct SvXMLEnumMapEntry;
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
index c2e6ff61ef1f..c2f7f928561a 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
@@ -24,10 +24,10 @@
#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; }
namespace beans { class XPropertySet; }
-} } }
+}
/**
diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx
b/xmloff/source/text/XMLIndexBodyContext.hxx
index 0c4aeffdf989..01688a1f2cdb 100644
--- a/xmloff/source/text/XMLIndexBodyContext.hxx
+++ b/xmloff/source/text/XMLIndexBodyContext.hxx
@@ -24,10 +24,10 @@
#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; }
namespace beans { class XPropertySet; }
-} } }
+}
/**
* Import index body.
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
index 3d05aa2dc568..34d750347c33 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
@@ -26,9 +26,9 @@
#include <com/sun/star/beans/PropertyValue.hpp>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
+}
class XMLIndexTemplateContext;
/**
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
index 8e7d4d38bb01..8033bddf941a 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
@@ -24,10 +24,10 @@
#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; }
namespace beans { class XPropertySet; }
-} } }
+}
/**
diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx
b/xmloff/source/text/XMLIndexMarkExport.hxx
index 158aa00498c4..05cd150518e2 100644
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
@@ -24,9 +24,9 @@
#include <com/sun/star/uno/Reference.h>
class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
- } } }
+}
/**
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx
b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
index 8c5139840eba..0bc9b98fbc4c 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
@@ -24,10 +24,10 @@
#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; }
namespace beans { class XPropertySet; }
-} } }
+}
/**
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
index 50748c9bf0ab..3e3ebd10f3f6 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
@@ -26,9 +26,9 @@
#include <com/sun/star/beans/PropertyValue.hpp>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
+}
class XMLIndexTemplateContext;
/**
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx
b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
index 09973439c805..c1e6122e6032 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
@@ -25,10 +25,10 @@
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace beans { class XPropertySet; }
-} } }
+}
enum IndexSourceParamEnum
{
diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx
b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
index bed33dde1f89..9fa2be5c8f93 100644
--- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
@@ -25,9 +25,9 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <rtl/ustrbuf.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
+}
/**
* Import index entry templates
diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx
b/xmloff/source/text/XMLIndexTOCContext.hxx
index 2238f8455d06..c24d283b98ef 100644
--- a/xmloff/source/text/XMLIndexTOCContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCContext.hxx
@@ -24,10 +24,10 @@
#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; }
namespace beans { class XPropertySet; }
-} } }
+}
enum IndexTypeEnum
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx
b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
index a36b4ce88345..1f56671c2a14 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
@@ -24,10 +24,10 @@
#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; }
namespace beans { class XPropertySet; }
-} } }
+}
/**
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx
b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
index ecd002872471..6f9733c73ff5 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
@@ -25,10 +25,10 @@
#include <vector>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace beans { class XPropertySet; }
-} } }
+}
/**
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
index 8d91c37bd238..9437fa2e7e96 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
@@ -27,9 +27,9 @@
#include <com/sun/star/beans/PropertyValue.hpp>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
+}
class XMLIndexTemplateContext;
/**
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx
b/xmloff/source/text/XMLIndexTableSourceContext.hxx
index b80d29220b3a..ef40cdecbd36 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx
@@ -24,10 +24,10 @@
#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; }
namespace beans { class XPropertySet; }
-} } }
+}
/**
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx
b/xmloff/source/text/XMLIndexTemplateContext.hxx
index 177e7db5896d..58b0775de430 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -28,10 +28,10 @@
#include <com/sun/star/beans/PropertyValues.hpp>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace beans { class XPropertySet; }
-} } }
+}
template<typename EnumT> struct SvXMLEnumMapEntry;
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
index e91cfeec3ee0..348030ca15c3 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
@@ -26,10 +26,10 @@
#include <rtl/ustrbuf.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+ namespace xml::sax { class XAttributeList; }
+}
/**
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx
b/xmloff/source/text/XMLIndexUserSourceContext.hxx
index 9a39dae86ba2..17581322a536 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx
@@ -24,10 +24,10 @@
#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; }
namespace beans { class XPropertySet; }
-} } }
+}
/**
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
index 2cc3a54c2fbc..a42b28fe4e5b 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
@@ -26,9 +26,9 @@
#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; }
+}
class XMLLineNumberingImportContext;
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx
b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index d3fa054b9050..10165c488d53 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -27,10 +27,10 @@
#include <memory>
#include <vector>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
namespace uno { template<class A> class Reference; }
-} } }
+}
/** This class maintains an OUString->sal_Int16 mapping for cases in
diff --git a/xmloff/source/text/XMLRedlineExport.hxx
b/xmloff/source/text/XMLRedlineExport.hxx
index 3d78a7338aae..3da7d70ddbd8 100644
--- a/xmloff/source/text/XMLRedlineExport.hxx
+++ b/xmloff/source/text/XMLRedlineExport.hxx
@@ -28,13 +28,13 @@
#include <map>
class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
namespace beans { struct PropertyValue; }
namespace text { class XText; }
namespace text { class XTextContent; }
namespace text { class XTextSection; }
- } } }
+}
// store a list of redline properties
typedef ::std::vector<
diff --git a/xmloff/source/text/XMLSectionExport.hxx
b/xmloff/source/text/XMLSectionExport.hxx
index 21894717b4f6..72c6247bcd2c 100644
--- a/xmloff/source/text/XMLSectionExport.hxx
+++ b/xmloff/source/text/XMLSectionExport.hxx
@@ -28,7 +28,7 @@
class SvXMLExport;
class XMLTextParagraphExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text
{
class XTextSection;
@@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star {
{
class XIndexReplace;
}
-} } }
+}
enum SectionTypeEnum
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
index 4ee4f2e68c2a..095352536f4f 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
@@ -29,10 +29,10 @@
class SvXMLImport;
struct XMLPropertyState;
class XMLPropertySetMapper;
-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; }
+}
/**
diff --git a/xmloff/source/text/XMLSectionImportContext.hxx
b/xmloff/source/text/XMLSectionImportContext.hxx
index 8e15a9fcb92d..fb2656b12210 100644
--- a/xmloff/source/text/XMLSectionImportContext.hxx
+++ b/xmloff/source/text/XMLSectionImportContext.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text { class XTextRange; }
namespace beans { class XPropertySet; }
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+ namespace xml::sax { class XAttributeList; }
+}
/**
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
index a67058f680cb..7f646c65a067 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
@@ -23,10 +23,10 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+ namespace xml::sax { class XAttributeList; }
+}
class XMLSectionSourceDDEImportContext : public SvXMLImportContext
{
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx
b/xmloff/source/text/XMLSectionSourceImportContext.hxx
index 865e9753ff6f..9bdb6b7733eb 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx
@@ -23,10 +23,10 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
- namespace xml { namespace sax { class XAttributeList; } }
-} } }
+ namespace xml::sax { class XAttributeList; }
+}
class XMLSectionSourceImportContext : public SvXMLImportContext
{
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
index 4c41d9db361d..da592981a7d9 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
@@ -23,9 +23,9 @@
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
-} } }
+}
class SvXMLExport;
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx
b/xmloff/source/text/XMLTextFrameContext.hxx
index e3c570c477fe..c37972712028 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -26,9 +26,9 @@
#include <xmloff/xmlictxt.hxx>
#include <xmlmultiimagehelper.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text { class XTextCursor; class XTextContent; }
-} } }
+}
class XMLTextFrameContextHyperlink_Impl;
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index eb3906e18c25..f11f81e20de9 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -25,10 +25,10 @@
#include <com/sun/star/text/TextContentAnchorType.hpp>
#include <xmloff/xmlictxt.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text { class XTextCursor; class XTextFrame; }
namespace beans { class XPropertySet; }
-} } }
+}
class XMLTextFrameHyperlinkContext : public SvXMLImportContext
{
diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx
b/xmloff/source/text/XMLTextMarkImportContext.hxx
index 8f68bb055d74..347273ef162a 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.hxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.hxx
@@ -25,15 +25,15 @@
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text {
class XTextRange;
class XTextContent;
}
- namespace xml { namespace sax {
+ namespace xml::sax {
class XAttributeList;
- } }
-} } }
+ }
+}
class XMLTextImportHelper;
class XMLFieldParamImportContext : public SvXMLImportContext
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx
b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 26394e17b059..28555f88af26 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -24,9 +24,9 @@
#include <com/sun/star/container/XIndexReplace.hpp>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text { class XTextContent; }
-} } }
+}
class XMLTextListAutoStylePool;
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx
b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
index 3abaa438b2e8..5e2af606b644 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
@@ -25,11 +25,11 @@
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax {
+namespace com::sun::star {
+ namespace xml::sax {
class XAttributeList;
- } }
-} } }
+ }
+}
class XMLTrackedChangesImportContext : public SvXMLImportContext
{
diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx
index 28eb57502be8..271a4f85e653 100644
--- a/xmloff/source/text/txtdrope.hxx
+++ b/xmloff/source/text/txtdrope.hxx
@@ -23,8 +23,7 @@
#include <rtl/ustring.hxx>
class SvXMLExport;
-namespace com { namespace sun { namespace star { namespace uno {
- class Any; } } } }
+namespace com::sun::star::uno { class Any; }
class XMLTextDropCapExport
{
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 7dcba0007e40..3b4a61a1c89d 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -25,10 +25,10 @@
#include <xmloff/xmlictxt.hxx>
class XMLHints_Impl;
-namespace com { namespace sun { namespace star {
-namespace text { class XTextRange; }
-namespace xml { namespace sax { class XAttributeList; } }
-} } }
+namespace com::sun::star {
+ namespace text { class XTextRange; }
+ namespace xml::sax { class XAttributeList; }
+}
#define CONV_FROM_STAR_BATS 1
#define CONV_FROM_STAR_MATH 2
diff --git a/xmloff/source/transform/TransformerBase.hxx
b/xmloff/source/transform/TransformerBase.hxx
index 9649f12ad286..d3c4f7ad6109 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -37,9 +37,9 @@
#include "TransformerActions.hxx"
#include "TransformerTokenMap.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace i18n { class XCharacterClassification; }
-}}}
+}
class SvXMLNamespaceMap;
class XMLTransformerContext;
diff --git a/xmloff/source/xforms/SchemaContext.hxx
b/xmloff/source/xforms/SchemaContext.hxx
index 1e65995eb2a2..e679d2855940 100644
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -23,11 +23,11 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace beans { class XPropertySet; }
namespace xforms { class XDataTypeRepository; }
-} } }
+}
class SvXMLImport;
class SvXMLImportContext;
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx
b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index 29a36247a335..d5c86a3fb3b2 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -23,11 +23,11 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace beans { class XPropertySet; }
namespace xforms { class XDataTypeRepository; }
-} } }
+}
class SvXMLImport;
class SvXMLImportContext;
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index 0280b0870f3c..da0e4f365866 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -23,11 +23,11 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace beans { class XPropertySet; }
namespace xforms { class XDataTypeRepository; }
-} } }
+}
class SvXMLImport;
class SvXMLImportContext;
diff --git a/xmloff/source/xforms/TokenContext.hxx
b/xmloff/source/xforms/TokenContext.hxx
index 97b595232726..f52fb362db1d 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -23,10 +23,10 @@
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmltkmap.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace uno { template<typename T> class Reference; }
-} } }
+}
class SvXMLImport;
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx
b/xmloff/source/xforms/XFormsBindContext.hxx
index 26424b8c406f..86a11f5ffb1c 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -23,11 +23,11 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace beans { class XPropertySet; }
namespace xforms { class XModel2; }
-} } }
+}
class SvXMLImport;
class SvXMLImportContext;
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx
b/xmloff/source/xforms/XFormsInstanceContext.hxx
index df77d00a7e18..46c443b5b910 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -23,12 +23,12 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
- namespace xml { namespace dom { class XDocument; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
+ namespace xml::dom { class XDocument; }
namespace beans { class XPropertySet; }
namespace xforms { class XModel2; }
-} } }
+}
class SvXMLImport;
class SvXMLImportContext;
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx
b/xmloff/source/xforms/XFormsModelContext.hxx
index d80b33088a7d..ff71c0795690 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -24,10 +24,10 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/xforms/XModel2.hpp>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace beans { class XPropertySet; }
-} } }
+}
class SvXMLImport;
class SvXMLImportContext;
diff --git a/xmloff/source/xforms/XFormsModelExport.hxx
b/xmloff/source/xforms/XFormsModelExport.hxx
index 42187b74450d..b809c7e31104 100644
--- a/xmloff/source/xforms/XFormsModelExport.hxx
+++ b/xmloff/source/xforms/XFormsModelExport.hxx
@@ -23,10 +23,10 @@
#include <sal/types.h>
class SvXMLExport;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno { template<typename T> class Reference; }
namespace beans { class XPropertySet; }
-} } }
+}
void exportXFormsModel( SvXMLExport&,
const css::uno::Reference<css::beans::XPropertySet>& );
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx
b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index 33ac54542bd8..f1b1a9019dbb 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -23,11 +23,11 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+namespace com::sun::star {
+ namespace xml::sax { class XAttributeList; }
namespace beans { class XPropertySet; }
namespace xforms { class XModel2; }
-} } }
+}
class SvXMLImport;
class SvXMLImportContext;
diff --git a/xmloff/source/xforms/xformsapi.hxx
b/xmloff/source/xforms/xformsapi.hxx
index 6f770627046a..442937641041 100644
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
@@ -26,12 +26,12 @@
#include <com/sun/star/uno/Any.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
namespace frame { class XModel; }
namespace uno { template<class A> class Reference; }
namespace xforms { class XDataTypeRepository; class XModel2; }
-} } }
+}
class SvXMLNamespaceMap;
css::uno::Reference<css::xforms::XModel2> xforms_createXFormsModel();
diff --git a/xmlscript/source/inc/unoservices.hxx
b/xmlscript/source/inc/unoservices.hxx
index 4ad18b40ee23..aecdcea30427 100644
--- a/xmlscript/source/inc/unoservices.hxx
+++ b/xmlscript/source/inc/unoservices.hxx
@@ -24,10 +24,10 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class XComponentContext;
class XInterface;
-} } } }
+}
namespace xmlscript {
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<
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
