Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

18 files changed, 50 insertions, 56 deletions

diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx
index e7d9ddc3ab91..34002b3d1701 100644
--- a/include/svx/ParseContext.hxx
+++ b/include/svx/ParseContext.hxx
@@ -19,12 +19,10 @@
 #ifndef SVX_QUERYDESIGNCONTEXT_HXX
 #define SVX_QUERYDESIGNCONTEXT_HXX
 
-#include "svx/svxdllapi.h"
 #include <connectivity/IParseContext.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 #include <unotools/localedatawrapper.hxx>
-
-
 #include <vector>
 
 namespace svxform
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index 98ddfc9441ec..9b5647657f77 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -19,8 +19,8 @@
 #ifndef _XPROPERTYENTRY_HXX
 #define _XPROPERTYENTRY_HXX
 
+#include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/string.hxx>
 #include <vcl/bitmap.hxx>
 
 // ---------------------
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index 5edd213026e7..ab9b8442c231 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -21,16 +21,16 @@
 #define _FMSEARCH_HXX
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include <vcl/dialog.hxx>
+#include <comphelper/stl_types.hxx>
+#include <comphelper/uno3.hxx>
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 #include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace util {
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index e277f0533f64..be886bc95840 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -20,10 +20,10 @@
 #ifndef _SVX_GALLERY1_HXX_
 #define _SVX_GALLERY1_HXX_
 
-#include <tools/string.hxx>
-#include <tools/urlobj.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/brdcst.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
+#include <tools/urlobj.hxx>
 
 #include <cstdio>
 #include <vector>
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index c6e5ce414db8..70efc190c69e 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -19,11 +19,11 @@
 #ifndef _SVX_HLNKITEM_HXX
 #define _SVX_HLNKITEM_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svl/macitem.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 #define HYPERDLG_EVENT_MOUSEOVER_OBJECT     0x0001
 #define HYPERDLG_EVENT_MOUSECLICK_OBJECT    0x0002
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index ee96b09a42fc..3ee4a84af154 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -22,6 +22,7 @@
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <editeng/numitem.hxx>
+#include <tools/string.hxx>
 #include <vcl/font.hxx>
 
 namespace svx { namespace sidebar {
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 00fa70f9e19b..416112743f3b 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -20,7 +20,6 @@
 #define _SVX_PAGEITEM_HXX
 
 #include <svl/poolitem.hxx>
-#include <tools/string.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index eec572efb2f4..11adda2d06f1 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -20,12 +20,11 @@
 #ifndef _SVDETC_HXX
 #define _SVDETC_HXX
 
-#include <tools/string.hxx>
-
-#include <vcl/outdev.hxx>
-#include <tools/shl.hxx>
+#include <rtl/ustring.hxx>
 #include <editeng/outliner.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
+#include <tools/shl.hxx>
+#include <vcl/outdev.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/svx/svdglob.hxx b/include/svx/svdglob.hxx
index 655fd6093dd9..a028e9f5b65d 100644
--- a/include/svx/svdglob.hxx
+++ b/include/svx/svdglob.hxx
@@ -20,9 +20,8 @@
 #ifndef _SVDGLOB_HXX
 #define _SVDGLOB_HXX
 
+#include <rtl/ustring.hxx>
 #include <sal/config.h>
-#include <tools/string.hxx>
-
 #include <svx/svxdllapi.h>
 
 //************************************************************
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index faeae356b0e7..d6e2afb0c255 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -20,13 +20,13 @@
 #ifndef _SVDMARK_HXX
 #define _SVDMARK_HXX
 
-#include <vector>
-
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 #include <svx/sdrobjectuser.hxx>
+#include <tools/solar.h>
 
 #include <set>
+#include <vector>
 
 class Rectangle;
 class SdrPage;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index e3f4f28c3b9d..c8ed6c29dc4b 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -22,12 +22,12 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/weakref.hxx>
+#include <rtl/ustring.hxx>
 #include <sot/storage.hxx>
 #include <tools/link.hxx>
 #include <tools/weakbase.hxx>
 #include <vcl/mapmod.hxx>
 #include <svl/brdcst.hxx>
-#include <tools/string.hxx>
 #include <tools/datetime.hxx>
 #include <svl/hint.hxx>
 
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index b0c623206714..18660b70c6a1 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -22,24 +22,24 @@
 
 #include <memory>
 #include <typeinfo>
-#include <cppuhelper/weakref.hxx>
-#include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
-#include <tools/weakbase.hxx>
 #include <com/sun/star/uno/Any.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/lstner.hxx>
-#include <vcl/timer.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/svdsob.hxx>
 #include <svx/svdtypes.hxx> // fuer SdrLayerID
 #include <svx/svdglue.hxx> // Klebepunkte
 #include <svx/xdash.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/xenum.hxx>
-#include <vcl/bitmapex.hxx>
 #include <svx/sdrobjectuser.hxx>
-#include "svx/svxdllapi.h"
-#include "svx/shapeproperty.hxx"
-#include <svl/poolitem.hxx>
+#include <svx/svxdllapi.h>
+#include <svx/shapeproperty.hxx>
+#include <tools/weakbase.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/mapmod.hxx>
+#include <vcl/timer.hxx>
 
 #include <boost/optional.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 8b11872172c3..a3fba13c8b21 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -21,13 +21,13 @@
 #define _SVDPAGV_HXX
 
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <tools/string.hxx>
+#include <cppuhelper/implbase4.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/lstner.hxx>
 #include <svx/svdhlpln.hxx>
-#include <cppuhelper/implbase4.hxx>
 #include <svx/svdsob.hxx>
 #include <svx/svdtypes.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 #include <cppuhelper/implbase3.hxx>
 #include <vector>
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index c86fd0d35582..ad9698705ed8 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -20,15 +20,13 @@
 #ifndef _SVDTRANS_HXX
 #define _SVDTRANS_HXX
 
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
+#include <tools/fract.hxx>
 #include <tools/gen.hxx>
 #include <tools/poly.hxx>
-#include <tools/fract.hxx>
-
-#include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
-
 #include <vcl/field.hxx>
+#include <vcl/mapmod.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx
index 7b9b7f2bd4be..84ef1d244fba 100644
--- a/include/svx/swframeposstrings.hxx
+++ b/include/svx/swframeposstrings.hxx
@@ -19,8 +19,8 @@
 #ifndef _SVXSWFRAMEPOSSTRINGS_HXX
 #define _SVXSWFRAMEPOSSTRINGS_HXX
 
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 
 /*
     contains strings needed for positioning dialogs
diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx
index 32dd1632db51..f69f7f4640fb 100644
--- a/include/svx/txenctab.hxx
+++ b/include/svx/txenctab.hxx
@@ -19,10 +19,10 @@
 #ifndef _SVX_TXENCTAB_HXX
 #define _SVX_TXENCTAB_HXX
 
-#include <tools/resary.hxx>
-#include <tools/string.hxx>
 #include <rtl/textenc.h>
-#include "svx/svxdllapi.h"
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
+#include <tools/resary.hxx>
 
 
 //========================================================================
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 23960e7fb8ea..466ee5d76ac3 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -20,9 +20,9 @@
 #ifndef _SVX_XMLEXCHG_HXX_
 #define _SVX_XMLEXCHG_HXX_
 
+#include <rtl/ustring.hxx>
 #include <svtools/transfer.hxx>
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 namespace com {
     namespace sun {
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 5d4463b96b17..baea5fb4cef7 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -20,6 +20,7 @@
 #define _XTABLE_HXX
 
 #include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/xdash.hxx>
 #include <svx/xhatch.hxx>
@@ -28,7 +29,6 @@
 #include <svx/xlnasit.hxx>
 
 #include <tools/color.hxx>
-#include <tools/string.hxx>
 #include <tools/contnr.hxx>
 
 #include <cppuhelper/weak.hxx>