diff options
| author | Eike Rathke <er@openoffice.org> | 2001-04-23 16:05:30 +0000 |
|---|---|---|
| committer | Eike Rathke <er@openoffice.org> | 2001-04-23 16:05:30 +0000 |
| commit | d3ae5c47df6ff2cf669a80cc0554acb119247950 (patch) | |
| tree | 6a9dd1af6a5eb6daa916d995018da06111d878e5 | |
| parent | 9ff0f90de8292a42aa34519ad94b2223e6fdc84f (diff) | |
#86141# add: GetProperLanguage: LANGUAGE_NONE --> application language
| -rw-r--r-- | svtools/source/numbers/zforlist.cxx | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/svtools/source/numbers/zforlist.cxx b/svtools/source/numbers/zforlist.cxx index 086810655138..d664dae24c71 100644 --- a/svtools/source/numbers/zforlist.cxx +++ b/svtools/source/numbers/zforlist.cxx @@ -2,9 +2,9 @@ * * $RCSfile: zforlist.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: er $ $Date: 2001-04-12 12:21:05 $ + * last change: $Author: er $ $Date: 2001-04-23 17:05:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -205,6 +205,7 @@ void SvNumberFormatter::ImpConstruct( LanguageType eLang ) pCalendar = new CalendarWrapper( xServiceManager ); pCalendar->loadDefaultCalendar( aLocale ); + eLang = GetProperLanguage( eLang ); if ( !International::IsFormatAvailable( eLang ) ) eLang = UNKNOWN_SUBSTITUTE; pIntl = new International( eLang ); @@ -231,6 +232,7 @@ void SvNumberFormatter::ChangeIntl(LanguageType eLnge) pLocaleData->setLocale( aLocale ); pCalendar->loadDefaultCalendar( aLocale ); + eLnge = GetProperLanguage( eLnge ); delete pIntl; if ( !International::IsFormatAvailable( eLnge ) ) eLnge = UNKNOWN_SUBSTITUTE; @@ -243,12 +245,22 @@ void SvNumberFormatter::ChangeIntl(LanguageType eLnge) // static -::com::sun::star::lang::Locale SvNumberFormatter::ConvertLanguageToLocale( LanguageType eLang ) +LanguageType SvNumberFormatter::GetProperLanguage( LanguageType eLang ) { if ( eLang == LANGUAGE_DONTKNOW ) eLang = UNKNOWN_SUBSTITUTE; + if ( eLang == LANGUAGE_NONE ) + eLang = Application::GetAppInternational().GetLanguage(); if ( eLang == LANGUAGE_SYSTEM ) eLang = International::GetRealLanguage( eLang ); + return eLang; +} + + +// static +::com::sun::star::lang::Locale SvNumberFormatter::ConvertLanguageToLocale( LanguageType eLang ) +{ + eLang = GetProperLanguage( eLang ); String aLanguage, aCountry, aVariant; ConvertLanguageToIsoNames( eLang, aLanguage, aCountry ); return Locale( aLanguage, aCountry, aVariant ); |