diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 12:09:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 12:09:45 +0000 |
| commit | f08b3b401188a102485f96c10f01be257e54b97b (patch) | |
| tree | bd3c909b90f4d099f0790c19aa62bc19cba9a99d | |
| parent | b815ed8386959e63e7b0efb358455694ec83cbbd (diff) | |
INTEGRATION: CWS internatiodel (1.6.52); FILE MERGED
2006/02/10 19:23:20 er 1.6.52.3: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId
2006/01/19 14:53:44 er 1.6.52.2: RESYNC: (1.6-1.8); FILE MERGED
2005/06/24 13:07:45 er 1.6.52.1: #i50205# get rid of class International
| -rw-r--r-- | connectivity/source/drivers/evoab/LFolderList.cxx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx index 9b356fb74cb2..2b3cc000e7c4 100644 --- a/connectivity/source/drivers/evoab/LFolderList.cxx +++ b/connectivity/source/drivers/evoab/LFolderList.cxx @@ -4,9 +4,9 @@ * * $RCSfile: LFolderList.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2005-12-21 13:16:04 $ + * last change: $Author: vg $ $Date: 2006-04-07 13:09:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,9 +69,6 @@ #ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> #endif -#ifndef _INTN_HXX //autogen -#include <tools/intn.hxx> -#endif #ifndef _ZFORLIST_HXX //autogen #include <svtools/zforlist.hxx> #endif @@ -97,8 +94,8 @@ #ifndef _UTL_CONFIGMGR_HXX_ #include <unotools/configmgr.hxx> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif #ifndef _DBHELPER_DBCONVERSION_HXX_ #include "connectivity/dbconversion.hxx" @@ -374,11 +371,9 @@ OEvoabFolderList::OEvoabFolderList( OEvoabConnection* _pConnection, void OEvoabFolderList::construct() { Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); - LanguageType eLanguage = ConvertIsoStringToLanguage(comphelper::getString(aValue),'-'); + LanguageType eLanguage = MsLangId::convertIsoStringToLanguage(comphelper::getString(aValue),'-'); - String sLanguage, sCountry; - ConvertLanguageToIsoNames(eLanguage, sLanguage, sCountry); - ::com::sun::star::lang::Locale aAppLocale(sLanguage,sCountry,rtl::OUString()); + ::com::sun::star::lang::Locale aAppLocale(MsLangId::convertLanguageToLocale(eLanguage)); Sequence< ::com::sun::star::uno::Any > aArg(1); aArg[0] <<= aAppLocale; |