Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

10 files changed, 22 insertions, 23 deletions

diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 609ef3440d3a..c7a29c38ee23 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -22,7 +22,6 @@
 #include <vector>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <rtl/ustring.hxx>
-#include <tools/string.hxx>
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 61c7386ae85c..a04f5ed860d8 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -32,7 +32,7 @@
 #include <tools/link.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 namespace svxform {
     class FmSearchConfigItem;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 63e9b76518ac..9a5c7bf532c1 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -20,13 +20,13 @@
 #ifndef SVX_DBREGISTER_HXX
 #define SVX_DBREGISTER_HXX
 
-#include "optpath.hxx"
-#include <tools/string.hxx>
 #include <comphelper/stl_types.hxx>
-#include <svl/poolitem.hxx>
-#include "ControlFocusHelper.hxx"
+#include <rtl/ustring.hxx>
 #include <sfx2/basedlgs.hxx>
+#include <svl/poolitem.hxx>
 #include <svtools/simptabl.hxx>
+#include "optpath.hxx"
+#include "ControlFocusHelper.hxx"
 
 class SvTreeListEntry;
 namespace svx
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 0f5832a59453..9ae773810a5b 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -48,7 +48,7 @@ private:
 
 protected:
     void FillDlgFields     ( String& aStrURL );
-    void GetCurentItemData ( String& aStrURL, String& aStrName,
+    void GetCurentItemData ( OUString& rStrURL, String& aStrName,
                              String& aStrIntName, String& aStrFrame,
                              SvxLinkInsertMode& eMode );
 
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 786a422f94b5..0ef62b25e6e2 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -42,7 +42,7 @@ private:
     FixedText           maFtFullURL;
     ImageButton         maBtBrowse;
 
-    String              maStrURL;
+    OUString            maStrURL;
 
     sal_Bool                mbMarkWndOpen;
 
@@ -59,11 +59,11 @@ private:
     enum EPathType { Type_Unknown, Type_Invalid,
                      Type_ExistsFile, Type_File,
                      Type_ExistsDir, Type_Dir };
-    EPathType GetPathType ( String& aStrPath );
+    EPathType GetPathType ( const OUString& rStrPath );
 
 protected:
     void FillDlgFields     ( String& aStrURL );
-    void GetCurentItemData ( String& aStrURL, String& aStrName,
+    void GetCurentItemData ( OUString& rStrURL, String& aStrName,
                              String& aStrIntName, String& aStrFrame,
                              SvxLinkInsertMode& eMode );
     virtual sal_Bool   ShouldOpenMarkWnd () {return mbMarkWndOpen;}
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index c79ead82657c..419465d455f7 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -74,7 +74,7 @@ private:
 
 protected:
     virtual void FillDlgFields     ( String& aStrURL );
-    virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
+    virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName,
                                      String& aStrIntName, String& aStrFrame,
                                      SvxLinkInsertMode& eMode );
     virtual sal_Bool ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index 9fdb4a5b22ab..0cbc6b2acbaf 100644
--- a/cui/source/inc/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
@@ -52,7 +52,7 @@ private:
 
 protected:
     virtual void FillDlgFields     ( String& aStrURL );
-    virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
+    virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName,
                                      String& aStrIntName, String& aStrFrame,
                                      SvxLinkInsertMode& eMode );
 
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 8e80f17d2d01..945c104cce29 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -105,7 +105,7 @@ protected:
     void InitStdControls ();
     virtual void FillStandardDlgFields ( SvxHyperlinkItem* pHyperlinkItem );
     virtual void FillDlgFields         ( String& aStrURL ) = 0;
-    virtual void GetCurentItemData     ( String& aStrURL, String& aStrName,
+    virtual void GetCurentItemData     ( OUString& rStrURL, String& aStrName,
                                          String& aStrIntName, String& aStrFrame,
                                          SvxLinkInsertMode& eMode ) = 0;
     virtual String CreateUiNameFromURL( const String& aStrURL );
@@ -118,7 +118,7 @@ protected:
 
     String              aEmptyStr;
 
-    static String   GetSchemeFromURL( String aStrURL );
+    static OUString GetSchemeFromURL( const OUString& rStrURL );
 
     inline void     DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; }
 
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 73e01e5ad2c1..84dee6977a6a 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -19,15 +19,15 @@
 #ifndef _ICCDLG_HXX
 #define _ICCDLG_HXX
 
+#include <rtl/ustring.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svtools/ivctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <vcl/image.hxx>
-#include <svtools/ivctrl.hxx>
-#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
-#include <tools/string.hxx>
 #include <vector>
 
 #define CTRLS_OFFSET        3
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 12761d031cf5..57dd1d72f150 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -21,17 +21,17 @@
 
 //------------------------------------------------------------------------
 
-#include <vcl/window.hxx>
-#include <tools/color.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <sfx2/tabdlg.hxx>
+#include <svx/langbox.hxx>
+#include <svx/fontlb.hxx>
+#include <tools/color.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/field.hxx>
-#include <svx/langbox.hxx>
-#include <svx/fontlb.hxx>
+#include <vcl/window.hxx>
 
 //------------------------------------------------------------------------