drop tools/string.hxx from a bunch of places

Change-Id: Id6d22b71f2b552ea7872e8a3da6afe207e856561

7 files changed, 2 insertions, 9 deletions

diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 3b4b18e060b9..dfd106a444bd 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -45,7 +45,6 @@
 #include "tools/datetime.hxx"
 #include "tools/debug.hxx"
 #include "tools/link.hxx"
-#include "tools/string.hxx"
 #include "tools/urlobj.hxx"
 #include "unotools/configmgr.hxx"
 #include "unotools/pathoptions.hxx"
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index 4849e4247112..4e7bc4c996ca 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -26,7 +26,6 @@
 #include <ucbhelper/content.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/datetime.hxx>
-#include <tools/string.hxx>
 #include <vcl/image.hxx>
 
 //........................................................................
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 09cc83a100e9..7b98251d31d2 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -19,7 +19,6 @@
 
 #include <osl/mutex.hxx>
 #include <tools/color.hxx>
-#include <tools/string.hxx>
 #include <vcl/image.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/compbase6.hxx>
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index d142dedd564d..afe7a04b7e04 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -31,7 +31,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <osl/mutex.hxx>
-#include <tools/string.hxx>
 #include <tools/rcid.h>
 #include <jvmfwk/framework.h>
 
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index 7abac4a35e78..334adb004719 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -22,10 +22,9 @@
 #include <sal/types.h>                  // for sal_Char, sal_Unicode, etc
 #include <stdlib.h>                     // for bsearch, qsort
 #include <string.h>                     // for strcmp
+#include <rtl/ustring.hxx>
 #include <svtools/htmltokn.h>
-#include <tools/solar.h>                // for String
 #include <svtools/htmlkywd.hxx>
-#include <tools/string.hxx>             // for String::CompareToAscii, etc
 
 // Table has still to be sorted
 struct HTML_TokenEntry
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index db0286cc57ad..c1159e15e73b 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -17,10 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include <rtl/ustring.hxx>
 #include <svtools/rtfkeywd.hxx>
 #include <svtools/rtftoken.h>
-#include "tools/string.hxx"
 
 #include <string.h>
 #include <ctype.h>
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 64f7e12921f1..5272fe1506c5 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -19,7 +19,6 @@
 
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <rtl/string.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <svtools/rtfkeywd.hxx>