Removed unnecessary tools includes.

11 files changed, 3 insertions, 9 deletions

diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 1508acce49b4..00256abfc7bf 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -31,7 +31,6 @@
 
 #include <set>
 #include <vector>
-#include <tools/string.hxx>
 #include <swdllapi.h>
 #include <SwNumberTreeTypes.hxx>
 
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index a671e046cb42..329fcb4e4adf 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -33,7 +33,6 @@
 #include "rtl/instance.hxx"
 #include <tools/solar.h>
 #include <tools/rtti.hxx>               // for RTTI of SwIndexReg
-#include <tools/string.hxx>             // for xub_StrLen
 #include <swdllapi.h>
 
 // Maximum index in IndexArray (for testing on overflows).
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 839f35781804..ee8635257a96 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -32,7 +32,6 @@
 #include <tools/solar.h>
 #include <tools/gen.hxx>
 #include <limits.h>       // USHRT_MAX
-#include <tools/string.hxx>
 
 class SwTxtNode;
 class SwIndex;
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 0449babb17f5..07596e018c5c 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <tools/string.hxx>
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 #include <cppuhelper/implbase2.hxx> // helper for implementations
 #include <cppuhelper/implbase3.hxx> // helper for implementations
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 2f20150a0078..bc34218110ce 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -30,6 +30,7 @@
 #include <algorithm>
 #include <functional>
 #include <SwNumberTree.hxx>
+#include <osl/diagnose.h>
 
 using std::vector;
 using std::find;
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 70b5712ae588..88ee1d38e3c2 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -30,6 +30,7 @@
 #include <assert.h>
 #include <stdlib.h>             // fuer qsort
 #include <tools/solar.h>
+#include <tools/string.hxx>
 
 #include "index.hxx"
 
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 37ebc5b4ce72..0fdac74399fe 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -28,7 +28,6 @@
 #ifndef SW_MVSAVE_HXX
 #define SW_MVSAVE_HXX
 
-#include <tools/string.hxx>
 #include <vcl/keycod.hxx>
 #include <svl/svarray.hxx>
 #include <IDocumentMarkAccess.hxx>
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 4ef3428322ec..6764f051d748 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -28,7 +28,6 @@
 
 
 
-#include <tools/string.hxx>
 #include "swtypes.hxx"
 #include "txttypes.hxx"
 
diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx
index 2c4d0dc3dae8..962828993813 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -29,7 +29,7 @@
 #ifndef _CSS1KYWD_HXX
 #define _CSS1KYWD_HXX
 
-#include <tools/string.hxx>
+#include <sal/types.h>
 
 #ifndef CSS1_CONSTASCII_DECL
 #define CSS1_CONSTASCII_DECL( n, s ) n[sizeof(s)]
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index e18cfcc100f1..ff86a532dc97 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -30,7 +30,6 @@
 #define _HTMLFLY_HXX
 
 #include <tools/solar.h>
-#include <tools/string.hxx>
 
 #include <svl/svarray.hxx>
 
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx
index c4c01242d3cb..ba73043798bd 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/ui/app/mainwn.cxx
@@ -31,7 +31,6 @@
 
 #include <mdiexp.hxx>
 #include <tools/shl.hxx>
-#include <tools/string.hxx>
 #include <svl/svstdarr.hxx>
 #include <sfx2/progress.hxx>
 #include <tools/resid.hxx>