[Libreoffice-commits] .: i18npool/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Nov 20 08:12:35 PST 2012
i18npool/source/isolang/inunx.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9de9c430ca36751b63744ccb2f31e5b075e599b0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Nov 20 17:09:39 2012 +0100
Blind fix for MACOSX-only MsLangId::convertIsoNamesToLanguage leftover
Change-Id: Iec2845cb3717520e1126ac4e9743413d5f3a5119
diff --git a/i18npool/source/isolang/inunx.cxx b/i18npool/source/isolang/inunx.cxx
index eb61f0b..778446a 100644
--- a/i18npool/source/isolang/inunx.cxx
+++ b/i18npool/source/isolang/inunx.cxx
@@ -30,6 +30,7 @@
#endif // MACOSX
#include <rtl/instance.hxx>
+#include "i18npool/languagetag.hxx"
#include "i18npool/mslangid.hxx"
// =======================================================================
@@ -101,7 +102,7 @@ static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage,
rtl::OUString rLang( procLocale->Language );
rtl::OUString rCountry( procLocale->Country );
- nLang = MsLangId::convertIsoNamesToLanguage( rLang, rCountry );
+ nLang = LanguageTag( rLang, rCountry ).getLanguageType();
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
rSystemLanguage = nLang;
#ifdef DEBUG
More information about the Libreoffice-commits
mailing list