From 926812bf8eb14b6ee8265f0e1db12d63622ae982 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 24 Oct 2006 12:09:34 +0000
Subject: INTEGRATION: CWS calc40 (1.6.6); FILE MERGED 2006/10/16 15:51:24 er
 1.6.6.1: #i67497# map LANGUAGE_NONE to new ISO 639-2 code 'zxx'

---
 i18npool/source/isolang/mslangid.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'i18npool')

diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index dfc7742dec46..d0df42e1401b 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: mslangid.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2006-10-06 09:09:26 $
+ *  last change: $Author: hr $ $Date: 2006-10-24 13:09:34 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -154,7 +154,10 @@ void MsLangId::convertLanguageToLocale( LanguageType nLang,
         ;   // nothing => empty locale
     else
     {
-        nLang = MsLangId::getRealLanguage( nLang);
+        // Still resolve LANGUAGE_DONTKNOW if resolving is not requested,
+        // but not LANGUAGE_NONE or others.
+        if (bResolveSystem || nLang == LANGUAGE_DONTKNOW)
+            nLang = MsLangId::getRealLanguage( nLang);
         convertLanguageToLocale( nLang, aLocale);
     }
     return aLocale;
-- 
cgit