diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 15:29:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 15:29:14 +0000 |
| commit | 460b519d21413349e3d9707fe09abcb892fd3663 (patch) | |
| tree | 6cb1cb2c4e5913cfac64c0b90adddcd1a7dded0e /unotools | |
| parent | 960caed663fbe574a48eb1bc6ea0135546e57d2d (diff) | |
INTEGRATION: CWS internatiodel (1.3.32); FILE MERGED
2006/02/10 19:32:56 er 1.3.32.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/i18n/intlwrapper.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index edac826d9b62..de8fcb9bee93 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: intlwrapper.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-09 09:44:18 $ + * last change: $Author: vg $ $Date: 2006-04-07 16:29:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,8 +41,8 @@ #include <com/sun/star/i18n/CollatorOptions.hpp> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif IntlWrapper::IntlWrapper( @@ -57,7 +57,7 @@ IntlWrapper::IntlWrapper( pCollator( NULL ), pCaseCollator( NULL ) { - eLanguage = ConvertIsoNamesToLanguage( aLocale.Language, aLocale.Country ); + eLanguage = MsLangId::convertLocaleToLanguage( aLocale ); } @@ -73,10 +73,7 @@ IntlWrapper::IntlWrapper( pCollator( NULL ), pCaseCollator( NULL ) { - String aLanguage, aCountry; - ConvertLanguageToIsoNames( eLanguage, aLanguage, aCountry ); - aLocale.Language = aLanguage; - aLocale.Country = aCountry; + MsLangId::convertLanguageToLocale( eLanguage, aLocale ); } |