diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-24 07:36:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-24 09:47:40 +0100 |
| commit | a16b4676a53fdc94c63821cf14e7f24e0fe20959 (patch) | |
| tree | 1c714bb3bac432f16b85f7427fab438fc9144493 /svx | |
| parent | 2862d842b3ca24cbf8c882fb59b30edc330c5fde (diff) | |
convert ResStringArray to rtl::OUString
Change-Id: I51b86a10caa5da6e12583c2b22404b0d9282b13d
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/strarray.hxx | 2 | ||||
| -rw-r--r-- | svx/inc/svx/txenctab.hxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/strarray.cxx | 5 | ||||
| -rw-r--r-- | svx/source/dialog/txenctab.cxx | 7 |
4 files changed, 7 insertions, 9 deletions
diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx index 258361278041..5a6b1dfe5bf4 100644 --- a/svx/inc/svx/strarray.hxx +++ b/svx/inc/svx/strarray.hxx @@ -42,7 +42,7 @@ public: SvxStringArray( const ResId& rResId ); ~SvxStringArray(); - const String& GetStringByPos( sal_uInt32 nPos ) const; + const rtl::OUString GetStringByPos( sal_uInt32 nPos ) const; }; diff --git a/svx/inc/svx/txenctab.hxx b/svx/inc/svx/txenctab.hxx index a923c5f66ad9..eef76513351a 100644 --- a/svx/inc/svx/txenctab.hxx +++ b/svx/inc/svx/txenctab.hxx @@ -45,7 +45,7 @@ public: SvxTextEncodingTable(); ~SvxTextEncodingTable(); - const String& GetTextString( const rtl_TextEncoding nEnc ) const; + const rtl::OUString GetTextString( const rtl_TextEncoding nEnc ) const; rtl_TextEncoding GetTextEncoding( const String& rStr ) const; }; 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; |