diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-21 23:49:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 09:39:18 +0100 |
| commit | b3c8e4177d24a184ffa854958fb177200608f68c (patch) | |
| tree | e39f1702e132a255954635aa06007f3d92bccc92 /rsc | |
| parent | 16032347d9b43d1ccefc185713e43b4d19974de6 (diff) | |
gsl_getSystemTextEncoding->osl_getThreadTextEncoding
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/parser/rscdb.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 012c340bc42e..b7eecdc33e09 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -315,7 +315,7 @@ public: { return (nFlags & NOSYSRESTEST_FLAG) ? sal_False : sal_True; } sal_Bool IsSrsDefault() const { return (nFlags & SRSDEFAULT_FLAG) ? sal_True : sal_False; } - ByteString ChangeLanguage( const ByteString& rNewLang ); + rtl::OString ChangeLanguage(const rtl::OString & rNewLang); const std::vector< sal_uInt32 >& GetFallbacks() const { return aLangFallbacks; } diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 1c7e544e18eb..3368c1fb54f8 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -130,9 +130,9 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont, return nRet; } -ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang ) +rtl::OString RscTypCont::ChangeLanguage(const rtl::OString& rNewLang) { - ByteString aRet = aLanguage; + rtl::OString aRet = aLanguage; aLanguage = rNewLang; rtl::OString aLang = aLanguage; @@ -145,8 +145,8 @@ ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang ) aVariant = aLang.copy( nIndex ); bool bAppendEnUsFallback = - ! (rNewLang.EqualsIgnoreCaseAscii( "en-US" ) || - rNewLang.EqualsIgnoreCaseAscii( "x-no-translate" ) ); + ! (rNewLang.equalsIgnoreAsciiCase( "en-US" ) || + rNewLang.equalsIgnoreAsciiCase( "x-no-translate" ) ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "RscTypCont::ChangeLanguage:" ); |