User: vg Date: 06/04/07 07:12:00 Modified: /dba/dbaccess/source/core/misc/ userinformation.cxx
Log: INTEGRATION: CWS internatiodel (1.6.80); FILE MERGED 2006/02/10 19:28:12 er 1.6.80.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang File Changes: Directory: /dba/dbaccess/source/core/misc/ ========================================== File [changed]: userinformation.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/userinformation.cxx?r1=1.6&r2=1.7 Delta lines: +4 -6 ------------------- --- userinformation.cxx 8 Sep 2005 13:57:35 -0000 1.6 +++ userinformation.cxx 7 Apr 2006 14:11:58 -0000 1.7 @@ -40,8 +40,8 @@ #ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif #ifndef _UTL_CONFIGMGR_HXX_ #include <unotools/configmgr.hxx> @@ -58,9 +58,7 @@ UserInformation::UserInformation() { Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); - LanguageType eLanguage = ConvertIsoStringToLanguage(comphelper::getString(aValue),'-'); - UniString sLanguage, sCountry; - ConvertLanguageToIsoNames(eLanguage, sLanguage, sCountry); - m_aUserLocale = Locale(sLanguage,sCountry,::rtl::OUString()); + LanguageType eLanguage = MsLangId::convertIsoStringToLanguage(comphelper::getString(aValue),'-'); + m_aUserLocale = MsLangId::convertLanguageToLocale(eLanguage); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
