diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 12:09:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 12:09:34 +0000 |
| commit | 926812bf8eb14b6ee8265f0e1db12d63622ae982 (patch) | |
| tree | d700c581047f47d6f48b62b6f51773b209598faf /i18npool/source/isolang | |
| parent | INTEGRATION: CWS calc40 (1.8.6); FILE MERGED (diff) | |
| download | core-926812bf8eb14b6ee8265f0e1db12d63622ae982.tar.gz core-926812bf8eb14b6ee8265f0e1db12d63622ae982.zip | |
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'
Diffstat (limited to 'i18npool/source/isolang')
| -rw-r--r-- | i18npool/source/isolang/mslangid.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
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; |