Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

15 files changed, 25 insertions, 30 deletions

diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index c5c492e85800..7ec841e50134 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -20,8 +20,8 @@
 #ifndef _SVX_ACCESSIBLE_EDITABLE_TEXT_PARA_HXX
 #define _SVX_ACCESSIBLE_EDITABLE_TEXT_PARA_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/compbase9.hxx>
 #include <cppuhelper/typeprovider.hxx>
diff --git a/include/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx
index 3252d1533edb..1d0a9a811d09 100644
--- a/include/editeng/AccessibleStringWrap.hxx
+++ b/include/editeng/AccessibleStringWrap.hxx
@@ -20,10 +20,9 @@
 #ifndef _ACCESSIBLESTRINGWRAP_HXX
 #define _ACCESSIBLESTRINGWRAP_HXX
 
-#include <sal/types.h>
-#include <tools/string.hxx>
-
 #include <editeng/editengdllapi.h>
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
 
 class OutputDevice;
 class SvxFont;
diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
index 6fc197fb1394..fef8807e07ec 100644
--- a/include/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
@@ -19,9 +19,9 @@
 #ifndef _SVX_CSCOITEM_HXX
 #define _SVX_CSCOITEM_HXX
 
-#include <tools/string.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
 
 // class SvxCharSetColorItem ---------------------------------------------
 
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 6ddf0e847175..0369c25e80b0 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -20,7 +20,7 @@
 #ifndef _EDITSTAT_HXX
 #define _EDITSTAT_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <i18nlangtag/lang.h>
 
 #define EE_CNTRL_USECHARATTRIBS     0x00000001  // Use of hard character attributes
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 8f9c7abcb35d..6f87e077ad08 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -19,8 +19,8 @@
 #ifndef _EDT_ABSTDLG_HXX
 #define _EDT_ABSTDLG_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <editeng/editengdllapi.h>
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index e083e86f72e8..0536c79ca33c 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -19,10 +19,10 @@
 #ifndef _SVX_FONTITEM_HXX
 #define _SVX_FONTITEM_HXX
 
+#include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
-#include <tools/string.hxx>
 #include <vcl/font.hxx>
-#include "editeng/editengdllapi.h"
 
 class SvXMLUnitConverter;
 
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 8a64415484a7..153a8fff9bc4 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -23,7 +23,7 @@
 #include <editeng/eerdll.hxx>
 
 // forward ---------------------------------------------------------------
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/resid.hxx>
 #include <tools/bigint.hxx>
 #include <svl/poolitem.hxx>
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 0ed0a841e1d8..d1a9c3412caa 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -19,8 +19,8 @@
 #ifndef _SVX_NUMITEM_HXX
 #define _SVX_NUMITEM_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/link.hxx>
-#include <tools/string.hxx>
 #include <svl/poolitem.hxx>
 #include <editeng/svxenum.hxx>
 #include <tools/gen.hxx>
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 3b3f18bfea72..b8f1236567d7 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -19,14 +19,12 @@
 #ifndef _OUTLINER_HXX
 #define _OUTLINER_HXX
 
-#include <tools/gen.hxx>
-#include <tools/string.hxx>
-
-#include <svl/brdcst.hxx>
-
 #include <editeng/editdata.hxx>
 #include <editeng/numitem.hxx>
 #include <i18nlangtag/lang.h>
+#include <rtl/ustring.hxx>
+#include <svl/brdcst.hxx>
+#include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <vcl/graph.hxx>
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 8aa45c2157d2..64ffdd2df509 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -22,11 +22,11 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <tools/solar.h>
-#include <tools/string.hxx>
-#include <rsc/rscsfx.hxx>
 #include <editeng/paragraphdata.hxx>
-#include "editeng/editengdllapi.h"
+#include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
+#include <rsc/rscsfx.hxx>
+#include <tools/solar.h>
 
 class EditTextObject;
 class ImplOutlinerParaObject;
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 41d07530cabe..3a7855f69b1c 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -19,10 +19,10 @@
 #ifndef _SVX_SPLWRAP_HXX
 #define _SVX_SPLWRAP_HXX
 
+#include <editeng/editengdllapi.h>
 #include <editeng/svxenum.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include "editeng/editengdllapi.h"
 
 // forward ---------------------------------------------------------------
 
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 4a5a83a147e9..856c19439c7c 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -20,9 +20,9 @@
 #ifndef _SVXRTF_HXX
 #define _SVXRTF_HXX
 
-#include <tools/string.hxx>
 #include <svl/itemset.hxx>
 #include <svtools/parrtf.hxx>
+#include <rtl/ustring.hxx>
 
 #include <editeng/editengdllapi.h>
 
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 74e2163ac544..fecbb4a6d815 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -20,12 +20,10 @@
 #ifndef EE_SVXSWAFOPT_HXX
 #define EE_SVXSWAFOPT_HXX
 
+#include <editeng/editengdllapi.h>
 #include <o3tl/sorted_vector.hxx>
-
-#include <tools/string.hxx>
-
+#include <rtl/ustring.hxx>
 #include <vcl/font.hxx>
-#include "editeng/editengdllapi.h"
 
 class SmartTagMgr;
 
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 0a3b6912d9a3..215785a6b2d1 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -22,11 +22,11 @@
 
 #include <com/sun/star/accessibility/TextSegment.hpp>
 
-#include <tools/solar.h>
 #include <i18nlangtag/lang.h>
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
+#include <tools/solar.h>
 #include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index a1c24c44d37e..c63f50239323 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -21,7 +21,7 @@
 #define _UNO_LINGU_HXX
 
 #include <i18nlangtag/lang.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <com/sun/star/util/Language.hpp>
 #include <com/sun/star/linguistic2/XLinguServiceManager2.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>