[Libreoffice-commits] core.git: shell/source

[Eike Rathke]

 shell/source/tools/lngconvex/lngconvex.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f1d47f8246b5513fa3a54ff16de4b1f4dd647ab
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Aug 30 13:23:32 2013 +0200

    attempt to roughly fix fdo#68740
    
    Actually that map wants a resolved fallback locale, not just a language
    to ID mapping, which light fallback was a side effect of
    MsLangId::convertIsoNamesToLanguage() and eliminated with the latest
    changes to LanguageTag conversion.
    
    Change-Id: I32f632c6b198383dd3eda8538ccb801c9275baca

diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index ea326c7..8c95f2a 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -330,7 +330,7 @@ void add_group_entries(
         iso_lang_identifier myiso_lang( iso_lang );
         LanguageType ltype = LanguageTag(
                 OStringToOUString( myiso_lang.language(), RTL_TEXTENCODING_UTF8),
-                OStringToOUString( myiso_lang.country(), RTL_TEXTENCODING_UTF8)).getLanguageType();
+                OStringToOUString( myiso_lang.country(), RTL_TEXTENCODING_UTF8)).makeFallback().getLanguageType();
         if(  ( ltype & 0x0200 ) == 0 && map[ ltype ].empty()  )
         {
             Substitutor.set_language(iso_lang_identifier(iso_lang));