diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 12:08:46 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 12:08:46 +0000 |
| commit | e3d8c4166f4f679bbfccd4ba9ddf0ea56b8f5127 (patch) | |
| tree | 79700f5b2e35f3fc03a243ea1e24968ff8dcb5eb /svx | |
| parent | 080eabdfed0e41fb9de9bcb8c0341a8d2e4022ee (diff) | |
INTEGRATION: CWS calc40 (1.65.48); FILE MERGED
2006/10/17 13:27:20 er 1.65.48.2: #i67497# SvxLanguageItem::PutValue: convertLocaleToLanguage already handles special cases, mapping an empty locale to LANGUAGE_NONE was wrong anyway
2006/10/16 15:51:46 er 1.65.48.1: #i67497# map LANGUAGE_NONE to new ISO 639-2 code 'zxx'
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/items/textitem.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx index 5a4d99d6e4cd..eb4bed570dea 100644 --- a/svx/source/items/textitem.cxx +++ b/svx/source/items/textitem.cxx @@ -4,9 +4,9 @@ * * $RCSfile: textitem.cxx,v $ * - * $Revision: 1.66 $ + * $Revision: 1.67 $ * - * last change: $Author: obo $ $Date: 2006-10-12 12:56:11 $ + * last change: $Author: hr $ $Date: 2006-10-24 13:08:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2738,7 +2738,7 @@ sal_Bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const rVal <<= (sal_Int16)(GetValue()); break; case MID_LANG_LOCALE: - lang::Locale aRet( MsLangId::convertLanguageToLocale( GetValue())); + lang::Locale aRet( MsLangId::convertLanguageToLocale( GetValue(), false)); rVal <<= aRet; break; } @@ -2768,10 +2768,7 @@ sal_Bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) if(!(rVal >>= aLocale)) return sal_False; - if (aLocale.Language.getLength() || aLocale.Country.getLength()) - SetValue(MsLangId::convertLocaleToLanguage( aLocale )); - else - SetValue(LANGUAGE_NONE); + SetValue(MsLangId::convertLocaleToLanguage( aLocale )); } break; } |