convert include/svx/txenc*.hxx from String to OUString

Change-Id: I4a87fcd660ea64a8328840f731bf4a9ab8b909dd
This commit is contained in:
Noel Grandin
2013-08-30 09:55:30 +02:00
parent 2e06478b28
commit f7b31b89ab
4 changed files with 5 additions and 5 deletions

View File

@@ -91,7 +91,7 @@ public:
sal_uInt16 nPos = LISTBOX_APPEND ); sal_uInt16 nPos = LISTBOX_APPEND );
void InsertTextEncoding( const rtl_TextEncoding nEnc, void InsertTextEncoding( const rtl_TextEncoding nEnc,
const String& rEntry, const OUString& rEntry,
sal_uInt16 nPos = LISTBOX_APPEND ); sal_uInt16 nPos = LISTBOX_APPEND );
void SelectTextEncoding( const rtl_TextEncoding nEnc, void SelectTextEncoding( const rtl_TextEncoding nEnc,
@@ -99,7 +99,7 @@ public:
rtl_TextEncoding GetSelectTextEncoding() const; rtl_TextEncoding GetSelectTextEncoding() const;
const String& GetSelectTextString() const; const OUString& GetSelectTextString() const;
}; };
#endif #endif

View File

@@ -36,7 +36,7 @@ public:
~SvxTextEncodingTable(); ~SvxTextEncodingTable();
const OUString GetTextString( const rtl_TextEncoding nEnc ) const; const OUString GetTextString( const rtl_TextEncoding nEnc ) const;
rtl_TextEncoding GetTextEncoding( const String& rStr ) const; rtl_TextEncoding GetTextEncoding( const OUString& rStr ) const;
}; };

View File

@@ -199,7 +199,7 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest()
//------------------------------------------------------------------------ //------------------------------------------------------------------------
void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, 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 ); sal_uInt16 nAt = InsertEntry( rEntry, nPos );
SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc ); SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc );

View File

@@ -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(); sal_uInt32 nCount = Count();