diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-14 15:10:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-15 09:11:36 +0200 |
| commit | 6dcb7199db421848ff53167e71fa367417dd70c8 (patch) | |
| tree | 0fcd2b177e64f6668350dbd8cd9e0d70f77ae0aa | |
| parent | f4d750cf892888d3377a0568fb8092fc275ec78c (diff) | |
convert include/svtools/langtab.hxx from String to OUString
Change-Id: Iae97d742a46a9090a70b247b35b5cecb7bb9883c
| -rw-r--r-- | include/svtools/langtab.hxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/langtab.cxx | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx index 1ef5875d2948..924235413a23 100644 --- a/include/svtools/langtab.hxx +++ b/include/svtools/langtab.hxx @@ -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 diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 4fcaa7399855..96a46c7f0adf 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -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(); |