[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 02f0e76c1cbb802ff3de545bf755144cd64e2b2a
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Dec 7 12:57:11 2009 +0000

    #i10000# undo accidental commit

diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index c8fdc6e..5fe767d 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -154,7 +154,7 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa
                 if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
                     nLang = LANGUAGE_CHINESE_SIMPLIFIED;
                 else
-                    nLang = nConfiguredAsianFallback;
+                    nLang = nConfiguredComplexFallback;
                 break;
             case ::com::sun::star::i18n::ScriptType::COMPLEX:
                 if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)
commit 6bd1fb4b0c24030eb86ed23a7cf215491c1ffd6e
Author: Mathias Bauer <mba at openoffice.org>
Date:   Mon Dec 7 10:20:56 2009 +0000

    #i106367#: typo again

diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index 5fe767d..c8fdc6e 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -154,7 +154,7 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sa
                 if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
                     nLang = LANGUAGE_CHINESE_SIMPLIFIED;
                 else
-                    nLang = nConfiguredComplexFallback;
+                    nLang = nConfiguredAsianFallback;
                 break;
             case ::com::sun::star::i18n::ScriptType::COMPLEX:
                 if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)