diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 15:27:28 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 15:27:28 +0000 |
| commit | d6ba29bc61dc0a51ee4ec14429188c248415b2f9 (patch) | |
| tree | 5f1cce1ae1d2671eb294b570f75045d351448cb4 /sc/source/ui/unoobj/convuno.cxx | |
| parent | e52a2e99356d4f094e06b680570dad71a681af39 (diff) | |
INTEGRATION: CWS internatiodel (1.4.96); FILE MERGED
2006/02/10 19:32:43 er 1.4.96.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
Diffstat (limited to 'sc/source/ui/unoobj/convuno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/convuno.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxx index e97c59fd9b4b..4abf4fb58d63 100644 --- a/sc/source/ui/unoobj/convuno.cxx +++ b/sc/source/ui/unoobj/convuno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: convuno.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:43:47 $ + * last change: $Author: vg $ $Date: 2006-04-07 16:27:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,7 +40,7 @@ #pragma hdrstop #include <tools/debug.hxx> -#include <tools/isolang.hxx> +#include <i18npool/mslangid.hxx> #include "convuno.hxx" #include "global.hxx" @@ -57,11 +57,7 @@ LanguageType ScUnoConversion::GetLanguage( const lang::Locale& rLocale ) if ( rLocale.Language.getLength() == 0 ) return LANGUAGE_SYSTEM; - String aLangStr(rLocale.Language); - String aCtryStr(rLocale.Country); - // Variant is ignored - - LanguageType eRet = ConvertIsoNamesToLanguage( aLangStr, aCtryStr ); + LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale ); if ( eRet == LANGUAGE_NONE ) eRet = LANGUAGE_SYSTEM; //! or throw an exception? @@ -70,10 +66,7 @@ LanguageType ScUnoConversion::GetLanguage( const lang::Locale& rLocale ) void ScUnoConversion::FillLocale( lang::Locale& rLocale, LanguageType eLang ) { - String aLangStr, aCtryStr; - ConvertLanguageToIsoNames( eLang, aLangStr, aCtryStr ); - rLocale.Language = aLangStr; - rLocale.Country = aCtryStr; + MsLangId::convertLanguageToLocale( eLang, rLocale ); } |