summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-09 15:54:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-09 20:02:48 +0200
commit01d0032fa306c596aaa44c5b35d69db6d90a65e6 (patch)
treea1007db72aa762539e5f0d545b7b57441dee4b9d /sw/source/filter
parent00d170213a112922980db67df62b8ee324ff2631 (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')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx2
-rw-r--r--sw/source/filter/ww8/docxexport.hxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx16
-rw-r--r--sw/source/filter/ww8/ww8par.hxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx4
-rw-r--r--sw/source/filter/xml/wrtxml.hxx4
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx4
-rw-r--r--sw/source/filter/xml/xmltbli.hxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx4
9 files changed, 18 insertions, 28 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index b8272d81603c..083a0fd0035c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -51,7 +51,7 @@ class SdrObject;
enum class SvxBoxItemLine;
namespace docx { class FootnotesList; }
-namespace oox { namespace drawingml { class DrawingML; } }
+namespace oox::drawingml { class DrawingML; }
struct FieldInfos
{
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index 33c02cd50cc4..04d29c2f65b9 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -45,11 +45,11 @@ namespace oox {
namespace vml { class VMLExport; }
}
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace frame { class XModel; }
namespace drawing { class XShape; }
namespace awt { class XControlModel; }
-} } }
+}
/// Data to be written in the document settings part of the document
struct DocxSettingsData
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 3f165d8fb4a8..00da29d78ce7 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -120,20 +120,12 @@ class WW8_WrtRedlineAuthor;
class SvxMSExportOLEObjects;
class SwMSConvertControls;
class WW8_WrPc;
-
-namespace com { namespace sun { namespace star { namespace embed {
-class XEmbeddedObject;
-} } } }
-typedef std::map<const css::embed::XEmbeddedObject*, sal_Int32> WW8OleMap;
struct WW8_PdAttrDesc;
class SvxBrushItem;
-namespace sw
-{
-namespace mark
-{
-class IFieldmark;
-}
-}
+namespace sw::mark { class IFieldmark; }
+namespace com::sun::star::embed { class XEmbeddedObject; }
+
+typedef std::map<const css::embed::XEmbeddedObject*, sal_Int32> WW8OleMap;
typedef std::set< sal_Int32 > SwSoftPageBreakList;
#define GRF_MAGIC_1 0x12 // 3 magic bytes for PicLocFc attribute
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 87156c52800d..1acde61e4c54 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -108,12 +108,12 @@ struct ESelection;
class SfxItemSet;
class OutlinerParaObject;
-namespace com{namespace sun {namespace star{
+namespace com::sun::star{
namespace beans{ class XPropertySet;}
namespace form { class XFormComponent;}
namespace drawing{class XShape;}
namespace lang{class XMultiServiceFactory;}
-}}}
+}
// defines only for the WW8-variable of the INI file
#define WW8FL_NO_STYLES 2
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
{