Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

20 files changed, 40 insertions, 42 deletions

diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx
index 076535e5feb6..6154c40c3a19 100644
--- a/include/vcl/FilterConfigItem.hxx
+++ b/include/vcl/FilterConfigItem.hxx
@@ -23,7 +23,7 @@
 
 #include <vcl/dllapi.h>
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Reference.h>
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index d6725202b6e1..62d29e679ce3 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -19,8 +19,8 @@
 #ifndef _VCL_ABSTDLG_HXX
 #define _VCL_ABSTDLG_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <vcl/dllapi.h>
 
 class Window;
diff --git a/include/vcl/controllayout.hxx b/include/vcl/controllayout.hxx
index b337ec730f88..84ce03146a0b 100644
--- a/include/vcl/controllayout.hxx
+++ b/include/vcl/controllayout.hxx
@@ -20,9 +20,9 @@
 #ifndef _VCL_CONTROLLAYOUT_HXX
 #define _VCL_CONTROLLAYOUT_HXX
 
-#include <vector>
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
+#include <vector>
 #include <vcl/dllapi.h>
 
 class Control;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 77a277f17df8..d58bd5dde37d 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -21,6 +21,7 @@
 #define _SV_EDIT_HXX
 
 #include <tools/solar.h>
+#include <tools/string.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/timer.hxx>
 #include <vcl/ctrl.hxx>
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index cae3c1b839ed..1bf9e746f9c1 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -20,9 +20,9 @@
 #ifndef _SV_FONT_HXX
 #define _SV_FONT_HXX
 
+#include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <vcl/dllapi.h>
-#include <tools/string.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
 #include <vcl/vclenum.hxx>
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 737229e0066b..a2e2034def15 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -20,11 +20,11 @@
 #ifndef _SV_GFXLINK_HXX
 #define _SV_GFXLINK_HXX
 
-#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <tools/stream.hxx>
 #include <tools/solar.h>
+#include <vcl/dllapi.h>
 #include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
-#include <tools/stream.hxx>
 
 // -------------
 // - ImpBuffer -
diff --git a/include/vcl/graph.h b/include/vcl/graph.h
index e6f85432445a..713b303a9225 100644
--- a/include/vcl/graph.h
+++ b/include/vcl/graph.h
@@ -20,9 +20,9 @@
 #ifndef _SV_GRAPH_H
 #define _SV_GRAPH_H
 
-#include <vcl/dllapi.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
+#include <vcl/dllapi.h>
 
 // ---------------
 // - GraphicType -
diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index 0ae55a77c514..7fa35aba748d 100644
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@@ -21,9 +21,9 @@
 #define _VCL_I18NHELP_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include <osl/mutex.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <tools/string.hxx>
+#include <osl/mutex.hxx>
+#include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
 
 namespace com {
diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 0e1747b956dc..7b31ff2e0363 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -20,10 +20,10 @@
 #ifndef _SV_KEYCODE_HXX
 #define _SV_KEYCODE_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <vcl/dllapi.h>
 #include <tools/resid.hxx>
+#include <vcl/dllapi.h>
 #include <vcl/keycodes.hxx>
 
 #include <vcl/vclenum.hxx>
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index f6447254ed60..4d366434717e 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -20,10 +20,10 @@
 #ifndef _SV_MNEMONIC_HXX
 #define _SV_MNEMONIC_HXX
 
-#include <vcl/dllapi.h>
-#include <tools/string.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 
 // ---------------------
 // - ImplMnemonicTypes -
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 0868da96120e..f39e080643b0 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -23,11 +23,10 @@
 #include <vector>
 #include <boost/unordered_map.hpp>
 
-#include "tools/string.hxx"
-#include "tools/stream.hxx"
-#include "rtl/string.hxx"
-
-#include "vcl/dllapi.h"
+#include <tools/stream.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 
 #include "com/sun/star/lang/Locale.hpp"
 
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index 1be7622cacbe..0a2c76c57687 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -20,10 +20,8 @@
 #ifndef VCL_QUICKSELECTIONENGINE_HXX
 #define VCL_QUICKSELECTIONENGINE_HXX
 
-#include "dllapi.h"
-
-#include <tools/string.hxx>
-
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 #include <memory>
 
 class KeyEvent;
diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx
index ab48231d23c2..6abd4b0ce6e6 100644
--- a/include/vcl/stdtext.hxx
+++ b/include/vcl/stdtext.hxx
@@ -20,7 +20,7 @@
 #ifndef _VCL_STDTEXT_HXX
 #define _VCL_STDTEXT_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 
diff --git a/include/vcl/strhelper.hxx b/include/vcl/strhelper.hxx
index 078f176fdec0..2b32e0dd6cdc 100644
--- a/include/vcl/strhelper.hxx
+++ b/include/vcl/strhelper.hxx
@@ -19,12 +19,10 @@
 #ifndef _PSPRINT_STRHELPER_HXX_
 #define _PSPRINT_STRHELPER_HXX_
 
-#include "vcl/dllapi.h"
-
-#include <tools/string.hxx>
-#include <rtl/math.hxx>
-
 #include <cstring>
+#include <rtl/math.hxx>
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 
 namespace psp
 {
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 9a116d7750ea..ba2cf9e3e973 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -29,8 +29,8 @@
 #include <vector>
 
 #include <comphelper/solarmutex.hxx>
+#include <rtl/ustring.hxx>
 #include <osl/thread.hxx>
-#include <tools/string.hxx>
 #include <tools/link.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index bf3f4bf34a30..353fc21902ea 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -20,10 +20,10 @@
 #ifndef _TEXTDATA_HXX
 #define _TEXTDATA_HXX
 
-#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
 #include <svl/brdcst.hxx>
 #include <svl/smplhint.hxx>
-#include <tools/string.hxx>
+#include <vcl/dllapi.h>
 
 // for Notify, if all paragraphs were deleted
 #define TEXT_PARA_ALL               0xFFFFFFFF
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index f449670c3030..4b8b920e8147 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -45,11 +45,12 @@ namespace svl
 
 class TextLine;
 class TETextPortion;
+#include <rtl/ustring.hxx>
 #include <svl/brdcst.hxx>
+#include <tools/lineend.hxx>
 #include <tools/link.hxx>
-#include <vcl/font.hxx>
-#include <tools/string.hxx>
 #include <tools/gen.hxx>
+#include <vcl/font.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index e25b6381c9b2..984d264c1ded 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -20,10 +20,11 @@
 #ifndef _TEXTVIEW_HXX
 #define _TEXTVIEW_HXX
 
-#include <vcl/dllapi.h>
-#include <vcl/textdata.hxx>
 #include <tools/gen.hxx>
+#include <tools/lineend.hxx>
+#include <vcl/dllapi.h>
 #include <vcl/dndhelp.hxx>
+#include <vcl/textdata.hxx>
 
 class TextEngine;
 class OutputDevice;
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index 7245057a82df..18d2eb919d74 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -20,11 +20,11 @@
 #ifndef _TXTATTR_HXX
 #define _TXTATTR_HXX
 
-#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
 #include <tools/color.hxx>
-#include <vcl/vclenum.hxx>
-#include <tools/string.hxx>
 #include <tools/debug.hxx>
+#include <vcl/vclenum.hxx>
+#include <vcl/dllapi.h>
 
 class Font;
 
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 6d31e188a2d4..4b6c79be2e05 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <cppuhelper/weak.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 
 namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {