convert include/svtools/ctrl*.hxx from String to OUString

Change-Id: I86b78137f02a11c5a2c34930b19cef22acd7ac69

include/svtools/ctrlbox.hxx

@@ -415,14 +415,14 @@ class SVT_DLLPUBLIC FontNameBox : public ComboBox
 private:
     ImplFontList*   mpFontList;
     sal_Bool        mbWYSIWYG;
-    String          maFontMRUEntriesFile;
+    OUString        maFontMRUEntriesFile;
 
     SVT_DLLPRIVATE void         ImplCalcUserItemSize();
     SVT_DLLPRIVATE void         ImplDestroyFontList();
 
 protected:
-    void            LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep = ';' );
-    void            SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep = ';' ) const;
+    void            LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep = ';' );
+    void            SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep = ';' ) const;
 public:
                     FontNameBox( Window* pParent,
                                  WinBits nWinStyle = WB_SORT );

include/svtools/ctrltool.hxx

@@ -228,10 +228,10 @@ public:
     sal_uLong                   Count() const { return mnElem; }
     sal_Bool                    IsEmpty() const { return !mnElem; }
 
-    long                    Name2Size( const String& ) const;
-    String                  Size2Name( long ) const;
+    long                    Name2Size( const OUString& ) const;
+    OUString                Size2Name( long ) const;
 
-    String                  GetIndexName( sal_uLong nIndex ) const;
+    OUString                GetIndexName( sal_uLong nIndex ) const;
     long                    GetIndexSize( sal_uLong nIndex ) const;
 };
 

svtools/source/control/ctrlbox.cxx

@@ -1072,12 +1072,12 @@ FontNameBox::~FontNameBox()
 
 // -------------------------------------------------------------------
 
-void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep ) const
+void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) const
 {
     OString aEntries(OUStringToOString(GetMRUEntries(cSep),
         RTL_TEXTENCODING_UTF8));
 
-    if (aEntries.isEmpty() || !aFontMRUEntriesFile.Len())
+    if (aEntries.isEmpty() || aFontMRUEntriesFile.isEmpty())
         return;
 
     SvFileStream aStream;
@@ -1097,9 +1097,9 @@ void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode
 
 // -------------------------------------------------------------------
 
-void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep )
+void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep )
 {
-    if( ! aFontMRUEntriesFile.Len() )
+    if( aFontMRUEntriesFile.isEmpty() )
         return;
 
     SvFileStream aStream( aFontMRUEntriesFile, STREAM_READ );
@@ -1126,9 +1126,9 @@ void FontNameBox::InitFontMRUEntriesFile()
     rtl::Bootstrap::expandMacros(sUserConfigDir);
 
     maFontMRUEntriesFile = sUserConfigDir;
-    if( maFontMRUEntriesFile.Len() )
+    if( !maFontMRUEntriesFile.isEmpty() )
     {
-        maFontMRUEntriesFile.AppendAscii( FONTNAMEBOXMRUENTRIESFILE );
+        maFontMRUEntriesFile += FONTNAMEBOXMRUENTRIESFILE;
     }
 }
 

svtools/source/control/ctrltool.cxx

@@ -876,7 +876,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage )
 
 //------------------------------------------------------------------------
 
-long FontSizeNames::Name2Size( const String& rName ) const
+long FontSizeNames::Name2Size( const OUString& rName ) const
 {
     if ( mnElem )
     {
@@ -894,7 +894,7 @@ long FontSizeNames::Name2Size( const String& rName ) const
 
 //------------------------------------------------------------------------
 
-String FontSizeNames::Size2Name( long nValue ) const
+OUString FontSizeNames::Size2Name( long nValue ) const
 {
     String aStr;
 
@@ -918,7 +918,7 @@ String FontSizeNames::Size2Name( long nValue ) const
 
 //------------------------------------------------------------------------
 
-String FontSizeNames::GetIndexName( sal_uLong nIndex ) const
+OUString FontSizeNames::GetIndexName( sal_uLong nIndex ) const
 {
     String aStr;