strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS internatiodel (1.3.110); FILE MERGED

Browse source 
2006/02/10 19:30:26 er 1.3.110.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
This commit is contained in:
Vladimir Glazounov 2006-04-07 14:01:57 +00:00
parent d8840e5dac
commit 27768c4bb7
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sd/source/ui/unoidl/unopool.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: unopool.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2005-09-09 06:53:44 $
* last change: $Author: vg $ $Date: 2006-04-07 15:01:57 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -33,8 +33,8 @@
*
************************************************************************/
#ifndef _ISOLANG_HXX
#include <tools/isolang.hxx>
#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX
#include <i18npool/mslangid.hxx>
#endif
#ifndef _COMPHELPER_PROPERTSETINFO_HXX_
@ -65,11 +65,7 @@ LanguageType SdUnoGetLanguage( const lang::Locale& rLocale )
if ( rLocale.Language.getLength() == 0 )
return LANGUAGE_SYSTEM;
String aLangStr = rLocale.Language;
String aCtryStr = rLocale.Country;
// Variant is ignored
LanguageType eRet = ConvertIsoNamesToLanguage( aLangStr, aCtryStr );
LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale );
if ( eRet == LANGUAGE_NONE )
eRet = LANGUAGE_SYSTEM; //! or throw an exception?