strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert include/svtools/langtab.hxx from String to OUString

Browse source 
Change-Id: Iae97d742a46a9090a70b247b35b5cecb7bb9883c
This commit is contained in:
Noel Grandin 2013-08-14 15:10:01 +02:00
parent f4d750cf89
commit 6dcb7199db
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/svtools/langtab.hxx
View file

@ -41,16 +41,16 @@ public:
If FALSE, do replace.
*/
const OUString GetString( const LanguageType eType, bool bUserInterfaceSelection = false ) const;
LanguageType GetType( const String& rStr ) const;
LanguageType GetType( const OUString& rStr ) const;
sal_uInt32 GetEntryCount() const;
LanguageType GetTypeAtIndex( sal_uInt32 nIndex ) const;
static String GetLanguageString( const LanguageType eType );
static OUString GetLanguageString( const LanguageType eType );
};
// Add LRE or RLE embedding characters to the string based on the
// String content (see #i78466#, #i32179#)
SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText );
SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText );
#endif

10
svtools/source/misc/langtab.cxx
View file

@ -37,9 +37,9 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText )
SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText )
{
const sal_uInt16 nLen = rText.Len();
const sal_Int32 nLen = rText.getLength();
if (nLen == 0)
return String();
@ -49,7 +49,7 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText )
// check if there are alreay embedding characters at the strings start
// if so change nothing
const sal_Unicode cChar = rText.GetBuffer()[0];
const sal_Unicode cChar = rText[0];
if (cChar == cLRE_Embedding || cChar == cRLE_Embedding)
return rText;
@ -151,7 +151,7 @@ const OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUser
return sLangTag;
}
String SvtLanguageTable::GetLanguageString( const LanguageType eType )
OUString SvtLanguageTable::GetLanguageString( const LanguageType eType )
{
static const SvtLanguageTable aLangTable;
return aLangTable.GetString( eType );
@ -159,7 +159,7 @@ String SvtLanguageTable::GetLanguageString( const LanguageType eType )
//------------------------------------------------------------------------
LanguageType SvtLanguageTable::GetType( const String& rStr ) const
LanguageType SvtLanguageTable::GetType( const OUString& rStr ) const
{
LanguageType eType = LANGUAGE_DONTKNOW;
sal_uInt32 nCount = Count();