Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

5 files changed, 10 insertions, 12 deletions

diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 4fba3e33b213..4ce510ad133f 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -20,12 +20,11 @@
 #ifndef _SFXITEMPOOL_HXX
 #define _SFXITEMPOOL_HXX
 
-#include "svl/svldllapi.h"
-
 #include <limits.h>
-#include <tools/solar.h>
-#include <tools/string.hxx>
+#include <rtl/string.hxx>
 #include <svl/poolitem.hxx>
+#include <svl/svldllapi.h>
+#include <tools/solar.h>
 #include <vector>
 
 class SvStream;
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 85e006e7270f..c6c218aec46f 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -21,11 +21,11 @@
 
 // class SvxMacroItem ----------------------------------------------------
 
-#include "svl/svldllapi.h"
+#include <rtl/ustring.hxx>
+#include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
 #include <tools/rtti.hxx>
 #include <tools/debug.hxx>
-#include <tools/string.hxx>
 #include <map>
 
 class SvStream;
diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index fdedea036d00..5ed3fbf9838e 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_NFKEYTAB_HXX
 
 #include <vector>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 //! For ImpSvNumberformatScan: first the short symbols, then the long symbols!
 //! e.g. first TT then TTTT
@@ -34,7 +34,7 @@
 // Note: 2005-09-02: the above applies to the binary file format.
 //
 // ER 15.12.99: This table is externally only to be used with method
-// String SvNumberformat::GetMappedFormatstring( const NfKeywordTable&, const LocaleDataWrapper& );
+// OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable&, const LocaleDataWrapper& );
 // and method
 // void SvNumberFormatter::FillKeywordTable( NfKeywordTable&, LanguageType );
 enum NfKeywordIndex
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index b16775fa9848..80820c51ee57 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -19,9 +19,9 @@
 #ifndef _UNDO_HXX
 #define _UNDO_HXX
 
-#include "svl/svldllapi.h"
+#include <svl/svldllapi.h>
+#include <rtl/ustring.hxx>
 #include <tools/rtti.hxx>
-#include <tools/string.hxx>
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx
index 672a9ec544a0..89d02cb70a29 100644
--- a/include/svl/urlbmk.hxx
+++ b/include/svl/urlbmk.hxx
@@ -20,8 +20,7 @@
 #ifndef _URLBMK_HXX
 #define _URLBMK_HXX
 
-
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 //=========================================================================