convert include/editeng/swafopt.hxx from String to OUString

Change-Id: Ic3686fb44cd1e448b9998f2ddc73f9bfd1b3aaa8

cui/source/tabpages/autocdlg.cxx

@@ -2202,7 +2202,7 @@ void OfaAutoCompleteTabPage::Reset( const SfxItemSet&  )
         nAutoCmpltListCnt = m_pAutoCompleteList->size();
         for (size_t n = 0; n < nAutoCmpltListCnt; ++n)
         {
-            const String* pStr =
+            const OUString* pStr =
                 &(*m_pAutoCompleteList)[n]->GetAutoCompleteString();
             sal_uInt16 nPos = aLBEntries.InsertEntry( *pStr );
             aLBEntries.SetEntryData( nPos, (void*)pStr );
@@ -2230,7 +2230,7 @@ IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl)
     while( nSelCnt )
     {
         sal_uInt16 nPos = aLBEntries.GetSelectEntryPos( --nSelCnt );
-        String* pStr = static_cast<String*>(aLBEntries.GetEntryData(nPos));
+        OUString* pStr = static_cast<OUString*>(aLBEntries.GetEntryData(nPos));
         aLBEntries.RemoveEntry( nPos );
         editeng::IAutoCompleteString hack(*pStr); // UGLY
         m_pAutoCompleteList->erase(&hack);

include/editeng/swafopt.hxx

@@ -34,11 +34,11 @@ namespace editeng {
 class EDITENG_DLLPUBLIC IAutoCompleteString
 {
 private:
-    String m_String;
+    OUString m_String;
 public:
-    explicit IAutoCompleteString(String const& rString) : m_String(rString) {}
+    explicit IAutoCompleteString(OUString const& rString) : m_String(rString) {}
     virtual ~IAutoCompleteString() {}
-    String const& GetAutoCompleteString() const { return m_String; }
+    OUString const& GetAutoCompleteString() const { return m_String; }
 };
 
 struct CompareAutoCompleteString
@@ -46,8 +46,8 @@ struct CompareAutoCompleteString
     bool operator()(IAutoCompleteString *const& lhs,
                     IAutoCompleteString *const& rhs) const
     {
-        return lhs->GetAutoCompleteString().CompareIgnoreCaseToAscii(
-                rhs->GetAutoCompleteString()) == COMPARE_LESS;
+        return lhs->GetAutoCompleteString().compareToIgnoreAsciiCase(
+                rhs->GetAutoCompleteString()) < 0;
     }
 };
 

sw/inc/acmplwrd.hxx

@@ -52,7 +52,7 @@ public:
 
     bool InsertWord( const String& rWord, SwDoc& rDoc );
 
-    const String& operator[](size_t n) const
+    const OUString& operator[](size_t n) const
         { return m_WordList[n]->GetAutoCompleteString(); }
 
     bool IsLockWordLstLocked() const           { return bLockWordLst; }

sw/source/core/doc/acmplwrd.cxx

@@ -327,7 +327,7 @@ void SwAutoCompleteWord::SetMinWordLen( sal_uInt16 n )
     if( n < nMinWrdLen )
     {
         for (size_t nPos = 0; nPos < m_WordList.size(); ++nPos)
-            if (m_WordList[ nPos ]->GetAutoCompleteString().Len() < n)
+            if (m_WordList[ nPos ]->GetAutoCompleteString().getLength() < n)
             {
                 SwAutoCompleteString *const pDel =
                     dynamic_cast<SwAutoCompleteString*>(m_WordList[nPos]);