diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 12:10:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 12:10:10 +0000 |
| commit | 39e221cd891a2d8982248111f02ba16dc9903ba8 (patch) | |
| tree | de874183f7af28022a6db321636718234045e038 | |
| parent | f08b3b401188a102485f96c10f01be257e54b97b (diff) | |
INTEGRATION: CWS internatiodel (1.9.52); FILE MERGED
2006/02/10 19:23:25 er 1.9.52.3: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId
2006/01/19 14:58:09 er 1.9.52.2: RESYNC: (1.9-1.11); FILE MERGED
2005/06/24 13:07:46 er 1.9.52.1: #i50205# get rid of class International
| -rw-r--r-- | connectivity/source/drivers/evoab/LTable.cxx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx index 37d96d2be784..77542e22f1f9 100644 --- a/connectivity/source/drivers/evoab/LTable.cxx +++ b/connectivity/source/drivers/evoab/LTable.cxx @@ -4,9 +4,9 @@ * * $RCSfile: LTable.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2005-12-21 13:16:28 $ + * last change: $Author: vg $ $Date: 2006-04-07 13:10:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,9 +68,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 @@ -96,8 +93,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" @@ -392,11 +389,9 @@ OEvoabTable::OEvoabTable(sdbcx::OCollection* _pTables,OEvoabConnection* _pConnec void OEvoabTable::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; |