From a16b4676a53fdc94c63821cf14e7f24e0fe20959 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 24 May 2012 07:36:47 +0100
Subject: convert ResStringArray to rtl::OUString

Change-Id: I51b86a10caa5da6e12583c2b22404b0d9282b13d
---
 svtools/inc/svtools/langtab.hxx | 2 +-
 svtools/source/misc/langtab.cxx | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'svtools')

diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx
index 578532271277..0d1ab3aeedb1 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/svtools/inc/svtools/langtab.hxx
@@ -49,7 +49,7 @@ public:
                      Tools->Options->LanguageSettings->UserInterface listbox.
             If FALSE, do replace.
      */
-    const String&   GetString( const LanguageType eType, bool bUserInterfaceSelection = false ) const;
+    const rtl::OUString GetString( const LanguageType eType, bool bUserInterfaceSelection = false ) const;
     LanguageType    GetType( const String& rStr ) const;
 
     sal_uInt32      GetEntryCount() const;
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 64af70ef4730..9168dafa5145 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -135,7 +135,7 @@ SvtLanguageTable::~SvtLanguageTable()
 
 //------------------------------------------------------------------------
 
-const String& SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const
+const rtl::OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const
 {
     LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType, bUserInterfaceSelection);
     sal_uInt32 nPos = FindIndex( eLang );
@@ -154,8 +154,7 @@ const String& SvtLanguageTable::GetString( const LanguageType eType, bool bUserI
         if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
             return ResStringArray::GetString( nPos );
     }
-    static String aEmptyStr;
-    return aEmptyStr;
+    return rtl::OUString();
 }
 
 String SvtLanguageTable::GetLanguageString( const LanguageType eType )
@@ -173,7 +172,7 @@ LanguageType SvtLanguageTable::GetType( const String& rStr ) const
 
     for ( sal_uInt32 i = 0; i < nCount; ++i )
     {
-        if ( rStr == ResStringArray::GetString( i ) )
+        if (ResStringArray::GetString( i ).equals(rStr))
         {
             eType = LanguageType( GetValue( i ) );
             break;
-- 
cgit