diff options
| author | Eike Rathke <erack@redhat.com> | 2013-08-23 17:32:05 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-08-23 23:09:06 +0200 |
| commit | 782808487510adae542ef25a9745d85f01d9dc38 (patch) | |
| tree | b482e047b49dbba037421389e7f38e9e133c639e /i18nlangtag | |
| parent | a829a352667d271408f791ee5e8a20dba844a5ff (diff) | |
eliminated lookupFallbackLanguage(LanguageType)
Change-Id: I2c69fce56151d4afcf5a68c29fd6755ff4f3b8dd
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 6 | ||||
| -rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 22 |
2 files changed, 6 insertions, 22 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index a581b3e88bd2..6f4af1cb0e27 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -767,12 +767,6 @@ static const MsLangId::IsoLangEntry & lcl_lookupFallbackEntry( LanguageType nLan return aLastResortFallbackEntry; } -// static -LanguageType MsLangId::Conversion::lookupFallbackLanguage( LanguageType nLang ) -{ - return lcl_lookupFallbackEntry( nLang).mnLang; -} - // static ::com::sun::star::lang::Locale MsLangId::Conversion::lookupFallbackLocale( LanguageType nLang ) diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 585929bdbade..62e1d9c15938 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -1120,22 +1120,12 @@ LanguageTag & LanguageTag::makeFallback() { if (!mbIsFallback) { - if (mbInitializedLangID) - { - LanguageType nLang1 = getLanguageType(); - LanguageType nLang2 = MsLangId::Conversion::lookupFallbackLanguage( nLang1); - if (nLang1 != nLang2) - reset( nLang2); - } - else - { - const lang::Locale& rLocale1 = getLocale(); - lang::Locale aLocale2( MsLangId::Conversion::lookupFallbackLocale( rLocale1)); - if ( rLocale1.Language != aLocale2.Language || - rLocale1.Country != aLocale2.Country || - rLocale1.Variant != aLocale2.Variant) - reset( aLocale2); - } + const lang::Locale& rLocale1 = getLocale( true); + lang::Locale aLocale2( MsLangId::Conversion::lookupFallbackLocale( rLocale1)); + if ( rLocale1.Language != aLocale2.Language || + rLocale1.Country != aLocale2.Country || + rLocale1.Variant != aLocale2.Variant) + reset( aLocale2); mbIsFallback = true; } return *this; |