Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

8 files changed, 2 insertions, 9 deletions

diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 2f68056e2f8d..9a1627eab7e3 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -411,7 +411,6 @@
 #include <tools/shl.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <unicode/uchar.h>
 #include <uno/mapping.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 26b9361078a2..026db6e068da 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -556,7 +556,6 @@
 #include <tools/resmgr.hxx>
 #include <tools/shl.hxx>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/vcompat.hxx>
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 441aef6d42fa..1656a21caafb 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -42,7 +42,6 @@
 #include "accessibility.hrc"
 #include "svx/svdstr.hrc"
 #include <svx/dialmgr.hxx>
-#include <tools/string.hxx>
 
 #include <svx/xdef.hxx>
 #include "svx/unoapi.hxx"
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 42dc8cf5f49c..fb50173af11d 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/string.hxx>
 #include <unotools/pathoptions.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index b389e5909092..2fc909ca0d37 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -18,7 +18,6 @@
  */
 
 #include <osl/mutex.hxx>
-#include <tools/string.hxx>
 #include <vcl/image.hxx>
 #include <comphelper/accessibleselectionhelper.hxx>
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 5c918a0e924c..1f8d33355d28 100644
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/stringlistresource.hxx
@@ -21,7 +21,6 @@
 #define SVX_STRINGLISTRESOURCE_HXX
 
 #include <tools/rc.hxx>
-#include <tools/string.hxx>
 #include <svx/svxdllapi.h>
 
 #include <memory>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ae68c4b8eb96..a9ac2fd19b10 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -31,7 +31,6 @@
 
 #include <unotools/ucbstreamhelper.hxx>
 
-#include <tools/string.hxx>
 #include <svl/whiter.hxx>
 #include <svx/xit.hxx>
 #include <svx/xbtmpit.hxx>
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 57b2aaee8a70..9056a6d60702 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svx/xtable.hxx>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svxids.hrc>
@@ -29,7 +29,7 @@ XOutdevItemPool::XOutdevItemPool(
     sal_uInt16 nAttrStart,
     sal_uInt16 nAttrEnd,
     sal_Bool bLoadRefCounts)
-:   SfxItemPool(String("XOutdevItemPool", osl_getThreadTextEncoding()), nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
+:   SfxItemPool(OUString("XOutdevItemPool"), nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
 {
     // prepare some defaults
     const OUString aNullStr;