diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 15:41:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 15:41:24 +0000 |
| commit | 61c7e9b049b442f3c25dfec0ff4e6c7072648b64 (patch) | |
| tree | 69686bfa3b3544c4686122c05b9fbd16169d6a63 /sfx2 | |
| parent | f84b4dd14f9d080ea5981be4213f059311953e0f (diff) | |
INTEGRATION: CWS internatiodel (1.14.124); FILE MERGED
2006/02/10 19:33:32 er 1.14.124.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/srchitem.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx index 59f457145cf9..b869d4ece1ff 100644 --- a/sfx2/source/control/srchitem.cxx +++ b/sfx2/source/control/srchitem.cxx @@ -4,9 +4,9 @@ * * $RCSfile: srchitem.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:08:40 $ + * last change: $Author: vg $ $Date: 2006-04-07 16:41:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -62,7 +62,9 @@ #endif #include <svtools/memberid.hrc> -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> +#endif #ifndef GCC #pragma hdrstop @@ -480,7 +482,7 @@ sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember { sal_Int16 nLocale; if (aSearchOpt.Locale.Language.getLength() || aSearchOpt.Locale.Country.getLength() ) - nLocale = ConvertIsoNamesToLanguage( aSearchOpt.Locale.Language, aSearchOpt.Locale.Country ); + nLocale = MsLangId::convertLocaleToLanguage( aSearchOpt.Locale ); else nLocale = LANGUAGE_NONE; rVal <<= nLocale; @@ -549,10 +551,7 @@ sal_Bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe } else { - String sLanguage, sCountry; - ConvertLanguageToIsoNames( (sal_Int16) nInt, sLanguage, sCountry ); - aSearchOpt.Locale.Language = sLanguage; - aSearchOpt.Locale.Country = sCountry; + MsLangId::convertLanguageToLocale( (sal_Int16) nInt, aSearchOpt.Locale ); } } break; |