drop tools/string.hxx from a bunch of places

Change-Id: Id6d22b71f2b552ea7872e8a3da6afe207e856561

19 files changed, 15 insertions, 30 deletions

diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx
index 202c5795fd07..abd9e42e2515 100644
--- a/sfx2/inc/bluthsndapi.hxx
+++ b/sfx2/inc/bluthsndapi.hxx
@@ -13,8 +13,8 @@
 #include <vector>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include "tools/link.hxx"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/link.hxx>
 #include "sfx2/dllapi.h"
 #include "mailmodelapi.hxx"
 
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 04eb03c85b2f..5d1dc1f8b2d0 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -20,12 +20,10 @@
 #ifndef _SFX_INETTBC_HXX
 #define _SFX_INETTBC_HXX
 
-#include <tools/string.hxx>
-
-#include <vcl/combobox.hxx>
-#include <svtools/acceleratorexecute.hxx>
-
+#include <rtl/ustring.hxx>
 #include <sfx2/tbxctrl.hxx>
+#include <svtools/acceleratorexecute.hxx>
+#include <vcl/combobox.hxx>
 
 class SvtURLBox;
 
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 4d575bbf4b41..ac79cc32d548 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -100,7 +100,6 @@
 #include "toolkit/awt/vclxdevice.hxx"
 #include "tools/datetime.hxx"
 #include "tools/debug.hxx"
-#include "tools/string.hxx"
 #include "vcl/msgbox.hxx"
 #include "vcl/svapp.hxx"
 #include <algorithm>
@@ -760,7 +759,6 @@
 #include <tools/rtti.hxx>
 #include <tools/shl.hxx>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <tools/svborder.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/time.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index f53278c9e015..56c0833ac9c4 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 #include <vcl/msgbox.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/itempool.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/slstitm.hxx>
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 131a68c672c8..9d6cbee2d2e7 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -19,7 +19,6 @@
 #ifndef _FILEOBJ_HXX
 #define _FILEOBJ_HXX
 
-#include <tools/string.hxx>
 #include <sfx2/linksrc.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/linkmgr.hxx>
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 3600f5efd5ae..e2eebaa2bb1f 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <tools/string.hxx>
 #include <tools/link.hxx>
 #include <vector>
 
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index 1f80a70e33c3..46904573966b 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -19,8 +19,8 @@
 #ifndef _IMPLDDE_HXX
 #define _IMPLDDE_HXX
 
+#include <rtl/ustring.hxx>
 #include <sfx2/linksrc.hxx>
-#include <tools/string.hxx>
 
 class DdeConnection;
 class DdeData;
diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx
index c6e4f3a26ae3..ea229a27617e 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -21,7 +21,6 @@
 #include "rtl/ustring.hxx"
 #include "sfx2/app.hxx"
 #include "sfx2/sfxresid.hxx"
-#include "tools/string.hxx"
 #include "vcl/msgbox.hxx"
 #include "vcl/svapp.hxx"
 
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index b5b215cb4904..afd3b925e932 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -28,7 +28,6 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <tools/resary.hxx>
-#include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index 9422c7f1a3ce..d7f2a19eddab 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -19,8 +19,9 @@
 
 #include <map>
 #include <boost/shared_ptr.hpp>
+#include <osl/thread.h>
+#include <rtl/ustring.hxx>
 #include <sot/storage.hxx>
-#include <tools/string.hxx>
 #include <vcl/bitmapex.hxx>
 
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index b9b4113b445a..00bf7b44e9dd 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -19,11 +19,11 @@
 #ifndef _SFX_APPDATA_HXX
 #define _SFX_APPDATA_HXX
 
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/lstner.hxx>
-#include <vcl/timer.hxx>
-#include <tools/string.hxx>
 #include <svtools/ehdl.hxx>
-#include "rtl/ref.hxx"
+#include <vcl/timer.hxx>
 
 #include <com/sun/star/frame/XModel.hpp>
 
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 31b32a673e35..65bd80db152a 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -21,8 +21,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/ucb/NameClash.hpp>
-
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/errcode.hxx>
 
 #include <vector>
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>