summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-24 07:36:47 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-05-24 09:47:40 +0100
commita16b4676a53fdc94c63821cf14e7f24e0fe20959 (patch)
tree1c714bb3bac432f16b85f7427fab438fc9144493 /svx/source
parent2862d842b3ca24cbf8c882fb59b30edc330c5fde (diff)
convert ResStringArray to rtl::OUString
Change-Id: I51b86a10caa5da6e12583c2b22404b0d9282b13d
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/dialog/strarray.cxx5
-rw-r--r--svx/source/dialog/txenctab.cxx7
2 files changed, 5 insertions, 7 deletions
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index d3e9b1d25b4e..ec7960383548 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -59,12 +59,11 @@ SvxStringArray::~SvxStringArray()
//------------------------------------------------------------------------
-const String& SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const
+const rtl::OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const
{
if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
return ResStringArray::GetString( nPos );
- else
- return String::EmptyString();
+ return rtl::OUString();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index 34bc1a3b61c5..7b8657741543 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -48,15 +48,14 @@ SvxTextEncodingTable::~SvxTextEncodingTable()
//------------------------------------------------------------------------
-const String& SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const
+const rtl::OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const
{
sal_uInt32 nPos = FindIndex( (long)nEnc );
if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
return ResStringArray::GetString( nPos );
- static String aEmptyString;
- return aEmptyString;
+ return rtl::OUString();
}
//------------------------------------------------------------------------
@@ -67,7 +66,7 @@ rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const String& rStr ) con
for ( sal_uInt32 i = 0; i < nCount; ++i )
{
- if ( rStr == ResStringArray::GetString( i ) )
+ if (ResStringArray::GetString( i ).equals(rStr))
return rtl_TextEncoding( GetValue( i ) );
}
return RTL_TEXTENCODING_DONTKNOW;