From a6e0d9124197254a884eefe89cb85beb5dc2d940 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Fri, 7 Apr 2006 14:28:52 +0000 Subject: INTEGRATION: CWS internatiodel (1.5.152); FILE MERGED 2006/02/10 19:31:30 er 1.5.152.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang --- vcl/source/app/i18nhelp.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vcl/source/app/i18nhelp.cxx') diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 98f2c8daeb27..54aef9bfc4f0 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: i18nhelp.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-09 11:40:26 $ + * last change: $Author: vg $ $Date: 2006-04-07 15:28:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,8 +67,8 @@ #include #endif -#ifndef _ISOLANG_HXX -#include +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include #endif using namespace ::com::sun::star; @@ -105,7 +105,7 @@ utl::TransliterationWrapper& vcl::I18nHelper::ImplGetTransliterationWrapper() co nModules |= i18n::TransliterationModules_IGNORE_CASE; ((vcl::I18nHelper*)this)->mpTransliterationWrapper = new utl::TransliterationWrapper( mxMSF, (i18n::TransliterationModules)nModules ); - ((vcl::I18nHelper*)this)->mpTransliterationWrapper->loadModuleIfNeeded( ConvertIsoNamesToLanguage( maLocale.Language, maLocale.Country ) ); + ((vcl::I18nHelper*)this)->mpTransliterationWrapper->loadModuleIfNeeded( MsLangId::convertLocaleToLanguage( maLocale ) ); } return *mpTransliterationWrapper; } -- cgit