User: vg Date: 06/04/07 06:10:13 Modified: /dba/connectivity/source/drivers/evoab/ LTable.cxx
Log: 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 File Changes: Directory: /dba/connectivity/source/drivers/evoab/ ================================================== File [changed]: LTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/LTable.cxx?r1=1.11&r2=1.12 Delta lines: +4 -9 ------------------- --- LTable.cxx 21 Dec 2005 13:16:28 -0000 1.11 +++ LTable.cxx 7 Apr 2006 13:10:10 -0000 1.12 @@ -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 @@ 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
