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

Locale <-> LanguageType functions adapted to change in ConvertLanguageToIsoNames

Browse source
This commit is contained in:
Thomas Lange 2000-12-15 09:21:30 +00:00
parent c9a265c418
commit 97ccaeed47
2 changed files with 29 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
linguistic/source/misc.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: misc.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: tl $ $Date: 2000-11-21 18:29:14 $
* last change: $Author: tl $ $Date: 2000-12-15 10:21:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -214,44 +214,39 @@ Reference< XDictionaryEntry > SearchDicList(
///////////////////////////////////////////////////////////////////////////
Locale CreateLocale( LanguageType eLang )
{
if ( eLang == LANGUAGE_NONE )
eLang = LANGUAGE_SYSTEM;
String aLangStr, aCtryStr;
ConvertLanguageToIsoNames( eLang, aLangStr, aCtryStr );
return Locale( aLangStr, aCtryStr, OUString() );
}
LanguageType LocaleToLanguage( const Locale& rLocale )
{
// empty language -> LANGUAGE_NONE
// empty Locale -> LANGUAGE_NONE
if ( rLocale.Language.getLength() == 0 )
return LANGUAGE_NONE;
// Variant of Locale is ignored
LanguageType eRet =
ConvertIsoNamesToLanguage( rLocale.Language, rLocale.Country );
if ( eRet == LANGUAGE_SYSTEM )
eRet = LANGUAGE_NONE;
return eRet;
return ConvertIsoNamesToLanguage( rLocale.Language, rLocale.Country );
}
Locale& LanguageToLocale( Locale& rLocale, LanguageType eLang )
{
String aLangStr, aCtryStr;
if ( eLang == LANGUAGE_NONE )
eLang = LANGUAGE_SYSTEM;
ConvertLanguageToIsoNames( eLang, aLangStr, aCtryStr );
if ( eLang != LANGUAGE_NONE /* && eLang != LANGUAGE_SYSTEM */)
ConvertLanguageToIsoNames( eLang, aLangStr, aCtryStr );
rLocale.Language = aLangStr;
rLocale.Country = aCtryStr;
rLocale.Variant = OUString();
return rLocale;
}
Locale CreateLocale( LanguageType eLang )
{
String aLangStr, aCtryStr;
if ( eLang != LANGUAGE_NONE /* && eLang != LANGUAGE_SYSTEM */)
ConvertLanguageToIsoNames( eLang, aLangStr, aCtryStr );
return Locale( aLangStr, aCtryStr, OUString() );
}
uno::Sequence< Locale > LangSeqToLocaleSeq( const uno::Sequence< INT16 > &rLangSeq )
{
const INT16 *pLang = rLangSeq.getConstArray();

31
svx/source/editeng/unolingu.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: unolingu.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: tl $ $Date: 2000-11-27 07:37:52 $
* last change: $Author: tl $ $Date: 2000-12-15 10:19:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -741,41 +741,34 @@ sal_Bool SvxSaveDictionaries( const Reference< XDictionaryList > &xDicList )
LanguageType SvxLocaleToLanguage( const Locale& rLocale )
{
// empty language -> LANGUAGE_NONE
// empty Locale -> LANGUAGE_NONE
if ( rLocale.Language.getLength() == 0 )
return LANGUAGE_NONE;
String aLangStr = rLocale.Language;
String aCtryStr = rLocale.Country;
// Variant is ignored
LanguageType eRet = ConvertIsoNamesToLanguage( aLangStr, aCtryStr );
if ( eRet == LANGUAGE_SYSTEM )
eRet = LANGUAGE_NONE;
return eRet;
// Variant of Locale is ignored
return ConvertIsoNamesToLanguage( rLocale.Language, rLocale.Country );
}
Locale& SvxLanguageToLocale( Locale& rLocale, LanguageType eLang )
{
String aLangStr, aCtryStr;
if ( eLang == LANGUAGE_NONE )
eLang = LANGUAGE_SYSTEM;
ConvertLanguageToIsoNames( eLang, aLangStr, aCtryStr );
if ( eLang != LANGUAGE_NONE /* && eLang != LANGUAGE_SYSTEM */)
ConvertLanguageToIsoNames( eLang, aLangStr, aCtryStr );
rLocale.Language = aLangStr;
rLocale.Country = aCtryStr;
rLocale.Variant = OUString();
return rLocale;
}
Locale SvxCreateLocale( LanguageType eLang )
{
if ( eLang == LANGUAGE_NONE )
eLang = LANGUAGE_SYSTEM;
String aLangStr, aCtryStr;
ConvertLanguageToIsoNames( eLang, aLangStr, aCtryStr );
if ( eLang != LANGUAGE_NONE /* && eLang != LANGUAGE_SYSTEM */)
ConvertLanguageToIsoNames( eLang, aLangStr, aCtryStr );
return Locale( aLangStr, aCtryStr, String() );
return Locale( aLangStr, aCtryStr, OUString() );
}