Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

5 files changed, 13 insertions, 18 deletions

diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index e699bd07fe1f..13f8509de84a 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <tools/string.hxx>
-
+#include <rtl/ustring.hxx>
 #include <svl/aeitem.hxx>
 #include <vector>
 
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index 9bc457fcd852..28e16926f37f 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -17,13 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <tools/string.hxx>
-#include <tools/stream.hxx>
-
-#include <svl/poolitem.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/itemset.hxx>
-
+#include <svl/poolitem.hxx>
+#include <tools/stream.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 498d57bb91c7..0184425ee172 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/date.hxx>
-#include <tools/time.hxx>
-#include <tools/string.hxx>
-#include <ucbhelper/content.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 #include <comphelper/processfactory.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/fstathelper.hxx>
+#include <tools/date.hxx>
+#include <tools/time.hxx>
+#include <ucbhelper/content.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 341fc219d3bf..3b04585c44d4 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -19,12 +19,12 @@
 #ifndef _ZFORSCAN_HXX
 #define _ZFORSCAN_HXX
 
-#include <tools/string.hxx>
-#include <tools/date.hxx>
 #include <i18nlangtag/lang.h>
-#include <tools/color.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/nfkeytab.hxx>
 #include <svl/nfsymbol.hxx>
+#include <tools/color.hxx>
+#include <tools/date.hxx>
 
 class SvNumberFormatter;
 struct ImpSvNumberformatInfo;
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 21307ff08f6e..375047fc5c2d 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -23,10 +23,10 @@
 #include <windows.h>
 #include <ddeml.h>
 
-#include <tools/string.hxx>
-#include <tools/shl.hxx>
 #include <boost/noncopyable.hpp>
+#include <rtl/ustring.hxx>
 #include <svl/svdde.hxx>
+#include <tools/shl.hxx>
 #include <vector>
 
 // ----------------