[Libreoffice-commits] .: i18npool/source

[Lubos Lunak]

 i18npool/source/isolang/mslangid.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8979193090f085d5d171a6daa6f8fa4a188b3130
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue May 29 16:24:14 2012 +0200

    Revert "fdo#45830: Indicate correct default locale setting"
    
    This causes a failure in sc_subsequent_filters_test , the test
    fails in non-English locales.
    
    This reverts commit 1a5aae96bdb20e36a17d77ec60da874037544628.

diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index 8fe16c0..3cd877e 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -94,7 +94,10 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang )
     switch (simplifySystemLanguages( nLang))
     {
         case LANGUAGE_SYSTEM :
-            nLang = getSystemLanguage();
+            if (nConfiguredSystemLanguage == LANGUAGE_SYSTEM)
+                nLang = getSystemLanguage();
+            else
+                nLang = nConfiguredSystemLanguage;
             break;
         case LANGUAGE_NONE :
             if (nConfiguredSystemUILanguage == LANGUAGE_SYSTEM)