XubString->OUString

Change-Id: I5424a148c7173409e6e56f9483fcc769696707bc

18 files changed, 4 insertions, 18 deletions

diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index d7864825b3b8..b3a88dfbe6a1 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -22,7 +22,6 @@
 
 #include "svtools/svtdllapi.h"
 
-#include <tools/string.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/image.hxx>
@@ -119,7 +118,7 @@ potentially not all applications [Draw,Equation,FontWork] can properly
 handle synthetic fonts. On filling, the previous name will be retained
 if possible.
 
-For DontKnow, the FontStyleBox should be filled with String(),
+For DontKnow, the FontStyleBox should be filled with OUString(),
 so it will contain a list with the default attributes. The currently
 shown style probably needs to be reset by the application.
 
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 33afac3fd3e8..ab54d55a0256 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -25,7 +25,6 @@
 #include "svtools/svtdllapi.h"
 
 #include <tools/errinf.hxx>
-#include <tools/string.hxx>
 
 class Window;
 class ResMgr;
diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx
index 35ed06dc92d5..0d8d96b8aa44 100644
--- a/include/svtools/helpopt.hxx
+++ b/include/svtools/helpopt.hxx
@@ -22,7 +22,7 @@
 #include "svtools/svtdllapi.h"
 
 #include <list>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 
 class SvtHelpOptions_Impl;
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 60dafcb4e130..f5fba8483271 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -21,7 +21,6 @@
 #define _IMAP_HXX
 
 #include "svtools/svtdllapi.h"
-#include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <vector>
 
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index 7f383de1197c..f77aec7fe29e 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -21,7 +21,6 @@
 #define _GOODIES_IMAPOBJ_HXX
 
 #include "svtools/svtdllapi.h"
-#include <tools/string.hxx>
 #include <svl/macitem.hxx>
 #include <rtl/strbuf.hxx>
 
diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx
index e5a80b5bbb1e..71d8daafa79a 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/svtools/inetimg.hxx
@@ -19,7 +19,6 @@
 #ifndef _INETIMG_HXX
 #define _INETIMG_HXX
 
-#include <tools/string.hxx>
 #include <tools/gen.hxx>
 
 class SvData;
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 104143696ec1..3c8fe00e2b0c 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -22,7 +22,6 @@
 
 #include "rtl/ref.hxx"
 #include "svtools/svtdllapi.h"
-#include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 
 #include <vcl/combobox.hxx>
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 0a8e05954d71..d8aecb48ade6 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -21,7 +21,6 @@
 #define _ICNVW_HXX
 
 #include "svtools/svtdllapi.h"
-#include <tools/string.hxx>
 #include <vcl/ctrl.hxx>
 #include <tools/link.hxx>
 #include <tools/contnr.hxx>
diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index 1bebf7d45c45..32d87b4e60bb 100644
--- a/include/svtools/openfiledroptargetlistener.hxx
+++ b/include/svtools/openfiledroptargetlistener.hxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/implbase1.hxx>
 
 #include <sot/exchange.hxx>
-#include <tools/string.hxx>
 
 /** DropTargetListener that takes care of opening a file when it is dropped in the frame.
 */
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index f57b1ce1845b..19eca16b6a66 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -22,7 +22,6 @@
 
 #include "svtools/svtdllapi.h"
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <svtools/svparser.hxx>
 
 #include <boost/ptr_container/ptr_vector.hpp>
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index ee4688e9f96d..7d159af51f2c 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -22,9 +22,9 @@
 
 #include "svtools/svtdllapi.h"
 #include <tools/link.hxx>
-#include <tools/string.hxx>
 #include <tools/ref.hxx>
 #include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/utility.hpp>
 #include <vector>
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index f85732638cfa..6354a0a416bd 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -23,7 +23,6 @@
 #include "svtools/svtdllapi.h"
 #include <tools/globname.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <sot/formats.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase4.hxx>
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 8019779b3748..3632bb1fd584 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -21,6 +21,7 @@
 #define _SVX_XMLEXCHG_HXX_
 
 #include <svtools/transfer.hxx>
+#include <tools/string.hxx>
 #include "svx/svxdllapi.h"
 
 namespace com {
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index 0522df360ce2..230a5b2c5057 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -24,7 +24,6 @@
 
 #include <boost/noncopyable.hpp>
 #include <i18nlangtag/languagetag.hxx>
-#include <tools/string.hxx>
 #include <tools/solar.h>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 #include <com/sun/star/i18n/KParseTokens.hpp>
diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx
index 4a1864b2f44f..77ead6b8a523 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -23,7 +23,6 @@
 #include "unotools/unotoolsdllapi.h"
 
 #include <rtl/ustring.hxx>
-#include <tools/string.hxx>
 
 namespace utl
 {
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index 426524dbff8e..d1d6bd9f45de 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_unotools_PATHOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
-#include <tools/string.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/options.hxx>
 
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index da3a472e8f60..9efe45a3fb9f 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -21,7 +21,6 @@
 #ifndef _UNOTOOLS_TEMPFILE_HXX
 #define _UNOTOOLS_TEMPFILE_HXX
 
-#include <tools/string.hxx>
 #include <tools/stream.hxx>
 
 namespace utl
diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index 44552d652cd1..4a48a21a2820 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -45,7 +45,6 @@ namespace com
     }
 }
 
-class String;
 namespace utl
 {
     class UcbLockBytesHandler;