Related: fdo#38838 remove UniString::CompareIgnoreCaseToAscii

Change-Id: I4a9b34d63d2534a35aa9a878b8c2bec15262c2be

5 files changed, 12 insertions, 12 deletions

diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index d5b7030c1215..74e7e19ea7e8 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -105,9 +105,9 @@ bool IsValidSbxName( const OUString& rName )
     return true;
 }
 
-static bool StringCompareLessThan( const String& rStr1, const String& rStr2 )
+static bool StringCompareLessThan( const OUString& rStr1, const OUString& rStr2 )
 {
-    return (rStr1.CompareIgnoreCaseToAscii( rStr2 ) == COMPARE_LESS);
+    return (rStr1.compareToIgnoreAsciiCase( rStr2 ) < 0);
 }
 
 //----------------------------------------------------------------------------
@@ -115,7 +115,7 @@ static bool StringCompareLessThan( const String& rStr1, const String& rStr2 )
 Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryContainer >& xModLibContainer, const Reference< script::XLibraryContainer >& xDlgLibContainer )
 {
     // create a sorted list of module library names
-    ::std::vector<String> aModLibList;
+    ::std::vector<OUString> aModLibList;
     if ( xModLibContainer.is() )
     {
         Sequence< OUString > aModLibNames = xModLibContainer->getElementNames();
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 41c2491a05ca..5087fdae129c 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -588,11 +588,11 @@ namespace
 struct TabBarSortHelper
 {
     sal_uInt16      nPageId;
-    String          aPageText;
+    OUString        aPageText;
 
     bool operator < (TabBarSortHelper const& rComp) const
     {
-        return aPageText.CompareIgnoreCaseToAscii(rComp.aPageText) == COMPARE_LESS;
+        return aPageText.compareToIgnoreAsciiCase(rComp.aPageText) < 0;
     }
 };
 
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 8952742bd145..1b9e4d75140f 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -216,21 +216,21 @@ void CheckBox::SetMode (ObjectMode::Mode e)
 
 //----------------------------------------------------------------------------
 
-SvTreeListEntry* CheckBox::DoInsertEntry( const String& rStr, sal_uLong nPos )
+SvTreeListEntry* CheckBox::DoInsertEntry( const OUString& rStr, sal_uLong nPos )
 {
     return SvTabListBox::InsertEntryToColumn( rStr, nPos, 0 );
 }
 
 //----------------------------------------------------------------------------
 
-SvTreeListEntry* CheckBox::FindEntry( const String& rName )
+SvTreeListEntry* CheckBox::FindEntry( const OUString& rName )
 {
     sal_uLong nCount = GetEntryCount();
     for ( sal_uLong i = 0; i < nCount; i++ )
     {
         SvTreeListEntry* pEntry = GetEntry( i );
         DBG_ASSERT( pEntry, "pEntry?!" );
-        if ( rName.CompareIgnoreCaseToAscii( GetEntryText( pEntry, 0 ) ) == COMPARE_EQUAL )
+        if ( rName.equalsIgnoreAsciiCase( GetEntryText( pEntry, 0 ) ) )
             return pEntry;
     }
     return 0;
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 34de345f8964..8d1576beacf3 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -134,8 +134,8 @@ public:
     CheckBox( Window* pParent, const ResId& rResId );
     ~CheckBox();
 
-    SvTreeListEntry*    DoInsertEntry( const String& rStr, sal_uLong nPos = LISTBOX_APPEND );
-    SvTreeListEntry*    FindEntry( const String& rName );
+    SvTreeListEntry*    DoInsertEntry( const OUString& rStr, sal_uLong nPos = LISTBOX_APPEND );
+    SvTreeListEntry*    FindEntry( const OUString& rName );
 
     void            CheckEntryPos( sal_uLong nPos );
     bool            IsChecked( sal_uLong nPos ) const;
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 17cc60798a33..8851d14e7fe7 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -127,9 +127,9 @@ namespace basctl
     //====================================================================
     namespace
     {
-        static bool StringCompareLessThan( const String& lhs, const String& rhs )
+        static bool StringCompareLessThan( const OUString& lhs, const OUString& rhs )
         {
-            return ( lhs.CompareIgnoreCaseToAscii( rhs ) == COMPARE_LESS );
+            return ( lhs.compareToIgnoreAsciiCase( rhs ) < 0 );
         }
 
         class FilterDocuments : public docs::IDocumentDescriptorFilter