mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not use the raw locale for osl_getTextEncodingFromLocale()

Browse Source 
Change-Id: Iab7402721b5fbf20a05c9ff2725e52b012df2940
This commit is contained in:
Eike Rathke
2013-02-13 20:16:42 +01:00
parent 5918c7c84c
commit 8a07032d01
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
unotools/source/misc/syslocale.cxx
View File

@@ -204,9 +204,21 @@ rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding()
{ {
// If the system locale is unknown to us, e.g. LC_ALL=xx, match the UI // If the system locale is unknown to us, e.g. LC_ALL=xx, match the UI
// language if possible. // language if possible.
::com::sun::star::lang::Locale aLocale( SvtSysLocale().GetUILanguageTag().getLocale() ); SvtSysLocale aSysLocale;
rtl_Locale * pLocale = rtl_locale_register( aLocale.Language.getStr(), const LanguageTag& rLanguageTag = aSysLocale.GetUILanguageTag();
aLocale.Country.getStr(), aLocale.Variant.getStr() ); // Converting blindly to Locale and then to rtl_Locale may feed the
// 'qlt' to rtl_locale_register() and the underlying system locale
// stuff, which doesn't know about it nor about BCP47 in the Variant
// field. So use the real language and for non-pure ISO cases hope for
// the best.. the fallback to UTF-8 should solve these cases nowadays.
/* FIXME-BCP47: the script needs to go in here as well, so actually
* we'd need some variant fiddling or glibc locale string and tweak
* rtl_locale_register() to know about it! But then again the Windows
* implementation still wouldn't know anything about it ... */
SAL_WARN_IF( !rLanguageTag.isIsoLocale(), "unotools.i18n",
"SvtSysLocale::GetBestMimeEncoding - non-ISO UI locale");
rtl_Locale * pLocale = rtl_locale_register( rLanguageTag.getLanguage().getStr(),
rLanguageTag.getCountry().getStr(), OUString().getStr() );
rtl_TextEncoding nEnc = osl_getTextEncodingFromLocale( pLocale ); rtl_TextEncoding nEnc = osl_getTextEncodingFromLocale( pLocale );
pCharSet = rtl_getBestMimeCharsetFromTextEncoding( nEnc ); pCharSet = rtl_getBestMimeCharsetFromTextEncoding( nEnc );
} }