diff options
| author | Eike Rathke <erack@redhat.com> | 2013-08-23 17:01:35 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-08-23 23:09:06 +0200 |
| commit | a829a352667d271408f791ee5e8a20dba844a5ff (patch) | |
| tree | 9023dda106e48db361f9b7a5dd409a2de3b18c17 /i18nlangtag | |
| parent | 84df29d34de7e1c36f57895f914a8b8090dff518 (diff) | |
extra convertLanguageToLocale(LanguageType,Locale) is unneeded
Change-Id: I3a56e7cafeb2453b877582f6c2d1a705cb91723b
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/source/isolang/mslangid.cxx | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx index 8ef2aa3392e9..f488e9cd6037 100644 --- a/i18nlangtag/source/isolang/mslangid.cxx +++ b/i18nlangtag/source/isolang/mslangid.cxx @@ -141,22 +141,6 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa return nLang; } -// static -void MsLangId::Conversion::convertLanguageToLocale( LanguageType nLang, - ::com::sun::star::lang::Locale & rLocale ) -{ - if (!rLocale.Variant.isEmpty()) - rLocale.Variant = OUString(); - convertLanguageToIsoNames( nLang, rLocale.Language, rLocale.Country); - /* FIXME: this x-... is temporary until conversion will be moved up to - * LanguageTag. Also handle the nasty "*" joker as privateuse. */ - if (rLocale.Language.startsWith( "x-") || (rLocale.Language == "*")) - { - rLocale.Variant = rLocale.Language; - rLocale.Language = "qlt"; - } -} - // static ::com::sun::star::lang::Locale MsLangId::Conversion::convertLanguageToLocale( @@ -171,7 +155,14 @@ void MsLangId::Conversion::convertLanguageToLocale( LanguageType nLang, // but not LANGUAGE_SYSTEM or others. if (bResolveSystem || nLang == LANGUAGE_DONTKNOW) nLang = MsLangId::getRealLanguage( nLang); - convertLanguageToLocale( nLang, aLocale); + convertLanguageToIsoNames( nLang, aLocale.Language, aLocale.Country); + /* 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 == "*")) + { + aLocale.Variant = aLocale.Language; + aLocale.Language = "qlt"; + } } return aLocale; } |