Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

6 files changed, 25 insertions, 25 deletions

diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 5fc1e8255ab0..efd8ab2952e3 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -148,11 +148,11 @@ void SwFldDBPage::Reset(const SfxItemSet&)
 
     if( !IsRefresh() )
     {
-        String sUserData = GetUserData();
-        if(sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1))
+        OUString sUserData = GetUserData();
+        if (sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1))
         {
-            String sVal = sUserData.GetToken(1, ';');
-            sal_uInt16 nVal = (sal_uInt16)sVal.ToInt32();
+            OUString sVal = sUserData.getToken(1, ';');
+            sal_uInt16 nVal = (sal_uInt16)sVal.toInt32();
             if(nVal != USHRT_MAX)
             {
                 for(i = 0; i < m_pTypeLB->GetEntryCount(); i++)
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 6536b12975d2..7cf2d5b204ea 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -124,11 +124,11 @@ void SwFldDokInfPage::Reset(const SfxItemSet& )
     }
 
     sal_uInt16 nSelEntryData = USHRT_MAX;
-    String sUserData = GetUserData();
-    if(sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1))
+    OUString sUserData = GetUserData();
+    if (sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1))
     {
-        String sVal = sUserData.GetToken(1, ';');
-        nSelEntryData = static_cast< sal_uInt16 >(sVal.ToInt32());
+        OUString sVal = sUserData.getToken(1, ';');
+        nSelEntryData = static_cast< sal_uInt16 >(sVal.toInt32());
     }
 
     std::vector<OUString> aLst;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 3203e24dd37e..2d55dfeed771 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -153,11 +153,11 @@ void SwFldDokPage::Reset(const SfxItemSet& )
 
     if( !IsRefresh() )
     {
-        String sUserData = GetUserData();
-        if( sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1 ))
+        OUString sUserData = GetUserData();
+        if (sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1))
         {
-            String sVal = sUserData.GetToken(1, ';');
-            sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.ToInt32());
+            OUString sVal = sUserData.getToken(1, ';');
+            sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.toInt32());
             if(nVal != USHRT_MAX)
             {
                 for(sal_uInt16 i = 0; i < m_pTypeLB->GetEntryCount(); i++)
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 6e9ff038ac88..576bc182b145 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -151,11 +151,11 @@ void SwFldFuncPage::Reset(const SfxItemSet& )
 
     if( !IsRefresh() )
     {
-        String sUserData = GetUserData();
-        if(sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1))
+        OUString sUserData = GetUserData();
+        if(sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1))
         {
-            String sVal = sUserData.GetToken(1, ';');
-            sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.ToInt32());
+            OUString sVal = sUserData.getToken(1, ';');
+            sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.toInt32());
             if(nVal != USHRT_MAX)
             {
                 for(sal_uInt16 i = 0; i < m_pTypeLB->GetEntryCount(); i++)
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 7fcabfa456f5..4173ec9c7a2f 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -239,12 +239,12 @@ void SwFldRefPage::Reset(const SfxItemSet& )
 
     if( !IsRefresh() )
     {
-        String sUserData = GetUserData();
-        if(!IsRefresh() && sUserData.GetToken(0, ';').
-                                EqualsIgnoreCaseAscii(USER_DATA_VERSION_1))
+        OUString sUserData = GetUserData();
+        if(!IsRefresh() && sUserData.getToken(0, ';').
+                                equalsIgnoreAsciiCase(USER_DATA_VERSION_1))
         {
-            String sVal = sUserData.GetToken(1, ';');
-            sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.ToInt32());
+            OUString sVal = sUserData.getToken(1, ';');
+            sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.toInt32());
             if(nVal != USHRT_MAX)
             {
                 for(sal_uInt16 i = 0; i < m_pTypeLB->GetEntryCount(); i++)
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index cbf808fbfbc3..6f2bf7a2e8a7 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -147,11 +147,11 @@ void SwFldVarPage::Reset(const SfxItemSet& )
 
     if( !IsRefresh() )
     {
-        String sUserData = GetUserData();
-        if(!IsRefresh() && sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1))
+        OUString sUserData = GetUserData();
+        if(!IsRefresh() && sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1))
         {
-            String sVal = sUserData.GetToken(1, ';');
-            sal_uInt16 nVal = (sal_uInt16)sVal.ToInt32();
+            OUString sVal = sUserData.getToken(1, ';');
+            sal_uInt16 nVal = (sal_uInt16)sVal.toInt32();
             if( USHRT_MAX != nVal )
             {
                 for(sal_uInt16 i = 0; i < m_pTypeLB->GetEntryCount(); i++)