7 files changed, 27 insertions, 2 deletions
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index f4a1f3ff7f56..371824cd24be 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX
 #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX
 
+#include <tools/solar.h>
 #include <o3tl/sorted_vector.hxx>
-#include <sal/types.h>
 
 class SdrObject;
 class SwFrmFmt;
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index c2af10afdfb5..301b8ff2bf5f 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX
 #define INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX
 
+#include <tools/solar.h>
+
 class RTFSurround
 {
     union {
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 83c10a864eb1..de63e3e691f7 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_INC_WRTSWTBL_HXX
 #define INCLUDED_SW_SOURCE_FILTER_INC_WRTSWTBL_HXX
 
+#include <tools/solar.h>
 #include <tools/color.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <o3tl/sorted_vector.hxx>
@@ -33,13 +34,18 @@ class SvxBrushItem;
 
 namespace editeng { class SvxBorderLine; }
 
-// Code aus dem HTML-Filter fuers schreiben von Tabellen
+//---------------------------------------------------------------------------
+//       Code aus dem HTML-Filter fuers schreiben von Tabellen
+//---------------------------------------------------------------------------
 
 #define COLFUZZY 20
 #define ROWFUZZY 20
 #define COL_DFLT_WIDTH ((2*COLFUZZY)+1)
 #define ROW_DFLT_HEIGHT (2*ROWFUZZY)+1
 
+
+//-----------------------------------------------------------------------
+
 class SW_DLLPUBLIC SwWriteTableCell
 {
     const SwTableBox *pBox;     // SwTableBox der Zelle
@@ -91,6 +97,9 @@ public:
 
 typedef boost::ptr_vector<SwWriteTableCell> SwWriteTableCells;
 
+
+//-----------------------------------------------------------------------
+
 class SW_DLLPUBLIC SwWriteTableRow
 {
     SwWriteTableCells aCells;       // Alle Zellen der Rows
@@ -159,6 +168,9 @@ public:
     ~SwWriteTableRows() { DeleteAndDestroyAll(); }
 };
 
+
+//-----------------------------------------------------------------------
+
 class SW_DLLPUBLIC SwWriteTableCol
 {
     sal_uInt32 nPos;                        // End Position der Spalte
@@ -218,6 +230,8 @@ public:
     ~SwWriteTableCols() { DeleteAndDestroyAll(); }
 };
 
+//-----------------------------------------------------------------------
+
 class SW_DLLPUBLIC SwWriteTable
 {
 protected:
@@ -310,6 +324,9 @@ public:
     const SwWriteTableRows& GetRows() const { return aRows; }
 };
 
+
+
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 580e554196f0..b7187546d0fa 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -20,6 +20,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
+#include <tools/solar.h>
 #include <rtl/ustring.hxx>
 #include <tools/stream.hxx>
 #include <IDocumentExternalData.hxx>
diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx
index 3e46973e0bc1..16ff8283db34 100644
--- a/sw/source/filter/xml/xmlexpit.hxx
+++ b/sw/source/filter/xml/xmlexpit.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX
 #define INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX
 
+#include <tools/solar.h>
 #include "xmlitmap.hxx"
 #include <vector>
 
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index 5739724243bd..219ae8dba848 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -20,6 +20,8 @@
 #define INCLUDED_SW_SOURCE_FILTER_XML_XMLIMPIT_HXX
 
 #include <limits.h>
+#include <tools/solar.h>
+
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include "xmlitmap.hxx"
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 0c80718ef19b..2573ce8a10f8 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <tools/solar.h>
 #include <limits.h>
 #include <xmloff/xmlictxt.hxx>
 
@@ -62,6 +63,7 @@ public:
                                    const SvXMLItemMapEntry& rEntry,
                                    const SvXMLUnitConverter& rUnitConv );
 
+
 };