diff options
| -rw-r--r-- | include/svx/txencbox.hxx | 4 | ||||
| -rw-r--r-- | include/svx/txenctab.hxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/txencbox.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/txenctab.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index b8b470116019..e0c0e392322b 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -91,7 +91,7 @@ public: sal_uInt16 nPos = LISTBOX_APPEND ); void InsertTextEncoding( const rtl_TextEncoding nEnc, - const String& rEntry, + const OUString& rEntry, sal_uInt16 nPos = LISTBOX_APPEND ); void SelectTextEncoding( const rtl_TextEncoding nEnc, @@ -99,7 +99,7 @@ public: rtl_TextEncoding GetSelectTextEncoding() const; - const String& GetSelectTextString() const; + const OUString& GetSelectTextString() const; }; #endif diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx index acb6ffbbe5f6..32dd1632db51 100644 --- a/include/svx/txenctab.hxx +++ b/include/svx/txenctab.hxx @@ -36,7 +36,7 @@ public: ~SvxTextEncodingTable(); const OUString GetTextString( const rtl_TextEncoding nEnc ) const; - rtl_TextEncoding GetTextEncoding( const String& rStr ) const; + rtl_TextEncoding GetTextEncoding( const OUString& rStr ) const; }; diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index ef3040727dc7..99fda8ec22ee 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -199,7 +199,7 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest() //------------------------------------------------------------------------ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, - const String& rEntry, sal_uInt16 nPos ) + const OUString& rEntry, sal_uInt16 nPos ) { sal_uInt16 nAt = InsertEntry( rEntry, nPos ); SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc ); diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index c67f0997ceed..f2bc3a880a59 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -51,7 +51,7 @@ const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc //------------------------------------------------------------------------ -rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const String& rStr ) const +rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const OUString& rStr ) const { sal_uInt32 nCount = Count(); |