diff options
| author | Eike Rathke <erack@redhat.com> | 2013-08-23 19:53:27 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-08-23 23:09:07 +0200 |
| commit | 22c19620dc44b8f619936c7dbd4b07c6a372d2de (patch) | |
| tree | 6a3a8911563a069504bc10d4a732a3293db5307c /i18nlangtag | |
| parent | d85566a48e47c8b4788b77d7cce77803ff797352 (diff) | |
convertLanguageToIsoNames() -> convertLanguageToLocaleImpl()
Change-Id: I4e34fb09a901a414f3106883d9ace1bff81311b5
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 20 | ||||
| -rw-r--r-- | i18nlangtag/source/isolang/mslangid.cxx | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index e16e230d5535..3edc5999b690 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -656,8 +656,8 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] = // ======================================================================= // static -void MsLangId::Conversion::convertLanguageToIsoNames( LanguageType nLang, - OUString& rLangStr, OUString& rCountry ) +void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang, + ::com::sun::star::lang::Locale & rLocale ) { if ( nLang == LANGUAGE_SYSTEM ) nLang = MsLangId::getSystemLanguage(); @@ -668,8 +668,8 @@ void MsLangId::Conversion::convertLanguageToIsoNames( LanguageType nLang, { if ( pEntry->mnLang == nLang ) { - rLangStr = OUString::createFromAscii( pEntry->maLangStr ); - rCountry = OUString::createFromAscii( pEntry->maCountry ); + rLocale.Language = OUString::createFromAscii( pEntry->maLangStr ); + rLocale.Country = OUString::createFromAscii( pEntry->maCountry ); return; } ++pEntry; @@ -684,8 +684,8 @@ void MsLangId::Conversion::convertLanguageToIsoNames( LanguageType nLang, { if ( pNoneStdEntry->mnLang == nLang ) { - rLangStr = OUString::createFromAscii( pNoneStdEntry->maLangStr ); - rCountry = OUString::createFromAscii( pNoneStdEntry->maCountry ); + rLocale.Language = OUString::createFromAscii( pNoneStdEntry->maLangStr ); + rLocale.Country = OUString::createFromAscii( pNoneStdEntry->maCountry ); return; } ++pNoneStdEntry; @@ -698,8 +698,8 @@ void MsLangId::Conversion::convertLanguageToIsoNames( LanguageType nLang, { if ( pPrivateEntry->mnLang == nLang ) { - rLangStr = OUString::createFromAscii( pPrivateEntry->mpLangStr ); - rCountry = OUString(); + rLocale.Language = OUString::createFromAscii( pPrivateEntry->mpLangStr ); + rLocale.Country = OUString(); return; } ++pPrivateEntry; @@ -707,8 +707,8 @@ void MsLangId::Conversion::convertLanguageToIsoNames( LanguageType nLang, while ( pPrivateEntry->mnLang != LANGUAGE_DONTKNOW ); // not found - rLangStr = OUString(); - rCountry = OUString(); + rLocale.Language = OUString(); + rLocale.Country = OUString(); } // ----------------------------------------------------------------------- diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx index 2e9ca7e938a6..c31fde12db0a 100644 --- a/i18nlangtag/source/isolang/mslangid.cxx +++ b/i18nlangtag/source/isolang/mslangid.cxx @@ -155,7 +155,7 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa // but not LANGUAGE_SYSTEM or others. if (bResolveSystem || nLang == LANGUAGE_DONTKNOW) nLang = MsLangId::getRealLanguage( nLang); - convertLanguageToIsoNames( nLang, aLocale.Language, aLocale.Country); + convertLanguageToLocaleImpl( nLang, aLocale); /* FIXME: this x-... is temporary until conversion will be moved up to * LanguageTag. Also handle the nasty "*" joker as privateuse. */ if (aLocale.Language.startsWith( "x-") || (aLocale.Language == "*")) |