diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-09 15:54:11 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-09 20:02:48 +0200 |
commit | 01d0032fa306c596aaa44c5b35d69db6d90a65e6 (patch) | |
tree | a1007db72aa762539e5f0d545b7b57441dee4b9d /sw/source/filter/xml | |
parent | 00d170213a112922980db67df62b8ee324ff2631 (diff) |
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>
Diffstat (limited to 'sw/source/filter/xml')
-rw-r--r-- | sw/source/filter/xml/XMLRedlineImportHelper.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/wrtxml.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlbrshi.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexte.hxx | 4 |
5 files changed, 9 insertions, 11 deletions
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index a1bd12dcb977..43bcdd5a92a8 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -31,11 +31,11 @@ class SvXMLImport; class RedlineInfo; class SwRedlineData; class SwDoc; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace text { class XTextCursor; } namespace text { class XTextRange; } namespace frame { class XModel; } -} } } +} typedef std::map< OUString, RedlineInfo* > RedlineMapType; diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index 0e24bbda914c..c82afcc97436 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -29,14 +29,14 @@ class SwPaM; class SfxMedium; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template<class A> class Reference; } namespace uno { template<class A> class Sequence; } namespace uno { class Any; } namespace lang { class XComponent; } namespace lang { class XMultiServiceFactory; } namespace beans { struct PropertyValue; } -} } } +} class SwXMLWriter : public StgWriter { diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index 3e07e42de3aa..7fb735e3080f 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -30,9 +30,9 @@ class SvXMLImport; class SvXMLUnitConverter; class SvxBrushItem; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace io { class XOutputStream; } -} } } +} class SwXMLBrushItemImportContext : public SvXMLImportContext { diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index e8e10df55225..445cd4b0534a 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -42,10 +42,10 @@ class SwXMLDDETableContext_Impl; class TableBoxIndexHasher; class TableBoxIndex; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace text { class XTextContent; } namespace text { class XTextCursor; } -} } } +} class SwXMLTableContext : public XMLTextTableContext { diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 8da021506c0d..e7ec5a991d3e 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -28,9 +28,7 @@ class SwXMLExport; class SvXMLAutoStylePoolP; class SwNoTextNode; - -namespace com { namespace sun { namespace star { namespace style { - class XStyle; } } } } +namespace com::sun::star::style { class XStyle; } class SwXMLTextParagraphExport : public XMLTextParagraphExport { |