diff options
| author | Eike Rathke <erack@redhat.com> | 2016-04-20 18:56:33 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-04-20 19:18:52 +0200 |
| commit | b7e3c63f1a384a278da4f6515f5279dbd5f46772 (patch) | |
| tree | 65f3947f3b6af31a9c2817dc6879233559bae10f /include/i18nlangtag | |
| parent | 100eb15b4d8529d7a11d98a28742f31f0f792fa1 (diff) | |
explicitly map 'C' locale and other known definitions to LanguageTag
Starting up a dbgutil build with LC_ALL=C gave
i18nlangtag/source/languagetag/languagetag.cxx:1362:
LanguageTagImpl::convertLocaleToLang: with bAllowOnTheFlyID invalid 'C'
i18nlangtag/source/languagetag/languagetag.cxx:1533:
LanguageTag::getLanguageFromLangtag: pLangT==NULL for 'C'
i18nlangtag/source/languagetag/languagetag.cxx:1593:
LanguageTag::getRegionFromLangtag: pRegionT==NULL for 'C'
Nothing harmful in this case as the default fallback is 'en-US', but it
also indicated that other known non-standard "locales" such as
"sr-latin" or "german" were not resolved to the defined values. Likely
such weird values are not in use anymore, but..
Change-Id: Ib3469354ceb236552540da5fd11d8f9e9c5ab1fd
Diffstat (limited to 'include/i18nlangtag')
| -rw-r--r-- | include/i18nlangtag/mslangid.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx index 22cf78512f85..d9d4eadb2171 100644 --- a/include/i18nlangtag/mslangid.hxx +++ b/include/i18nlangtag/mslangid.hxx @@ -249,9 +249,9 @@ public: I18NLANGTAG_DLLPRIVATE static css::lang::Locale getOverride( const css::lang::Locale & rLocale ); - /** Used by convertLocaleToLanguage(Locale) */ + /** Used by convertLocaleToLanguageImpl(Locale) and LanguageTagImpl::convertLocaleToLang() */ I18NLANGTAG_DLLPRIVATE static LanguageType convertIsoNamesToLanguage( - const OUString& rLang, const OUString& rCountry ); + const OUString& rLang, const OUString& rCountry, bool bSkipIsoTable ); /** Used by convertUnxByteStringToLanguage(OString) */ |