From 76bed69af66eb06c99fa2b03a15a542771d1c4c4 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Sat, 8 Apr 2006 08:57:49 +0000 Subject: [PATCH] INTEGRATION: CWS internatiodel (1.18.46); FILE MERGED 2006/02/10 19:29:40 er 1.18.46.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang --- desktop/source/app/langselect.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 6ba8fa1a2dae..06e2527b1725 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -4,9 +4,9 @@ * * $RCSfile: langselect.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: obo $ $Date: 2006-03-24 13:52:26 $ + * last change: $Author: vg $ $Date: 2006-04-08 09:57:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,8 +46,8 @@ #ifndef _TOOLS_RESID_HXX #include #endif -#ifndef _TOOLS_ISOLANG_HXX -#include +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include #endif #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include @@ -215,7 +215,7 @@ void LanguageSelection::setDefaultLocale(const OUString& usUILocale) // org.openoffice.Office.Linguistic/General/DefaultLocale_CTL // determine script type of UI locale - LanguageType ltUILocale = ConvertIsoStringToLanguage(usUILocale); + LanguageType ltUILocale = MsLangId::convertIsoStringToLanguage(usUILocale); sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(ltUILocale); try @@ -240,7 +240,7 @@ void LanguageSelection::setDefaultLocale(const OUString& usUILocale) // in the UI // covert the LanguageType we've got from the LanguageTable back to // an iso string and store it - OUString usDefault = ConvertLanguageToIsoString(ltUILocale); + OUString usDefault = MsLangId::convertLanguageToIsoString(ltUILocale); try { xProp->setPropertyValue(usName, makeAny(usDefault));