diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-21 18:34:53 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-21 18:35:53 +0100 |
| commit | b8a467b70756b83c8aeb77f385ea1e368350d370 (patch) | |
| tree | eb0c2a0f560899b634ef8598f9022f4af24f1427 /vcl | |
| parent | be677b568690415ff90e7937d7269d3b41b39c16 (diff) | |
obtain LanguageTag from SvtSysLocale
Change-Id: Iaee25f1d92349704eaae45e6582d31dfa718ddcb
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 82440fde45e2..aa42cb6c8ecd 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -1540,7 +1540,7 @@ bool AllSettings::GetLayoutRTL() const const ::com::sun::star::lang::Locale& AllSettings::GetLocale() const { if ( mpData->maLocale.Language.isEmpty() ) - mpData->maLocale = mpData->maSysLocale.GetLocale(); + mpData->maLocale = mpData->maSysLocale.GetLanguageTag().getLocale(); return mpData->maLocale; } @@ -1551,7 +1551,7 @@ const ::com::sun::star::lang::Locale& AllSettings::GetUILocale() const { // the UILocale is never changed if ( mpData->maUILocale.Language.isEmpty() ) - mpData->maUILocale = mpData->maSysLocale.GetUILocale(); + mpData->maUILocale = mpData->maSysLocale.GetUILanguageTag().getLocale(); return mpData->maUILocale; } @@ -1562,7 +1562,7 @@ LanguageType AllSettings::GetLanguage() const { // meLanguage == LANGUAGE_SYSTEM means: use settings from SvtSysLocale if ( mpData->meLanguage == LANGUAGE_SYSTEM ) - return mpData->maSysLocale.GetLanguage(); + return mpData->maSysLocale.GetLanguageTag().getLanguageType(); return mpData->meLanguage; } @@ -1572,7 +1572,7 @@ LanguageType AllSettings::GetLanguage() const LanguageType AllSettings::GetUILanguage() const { // the UILanguage is never changed - return mpData->maSysLocale.GetUILanguage(); + return mpData->maSysLocale.GetUILanguageTag().getLanguageType(); } // ----------------------------------------------------------------------- @@ -1628,7 +1628,7 @@ void AllSettings::LocaleSettingsChanged( sal_uInt32 nHint ) } if ( (nHint & SYSLOCALEOPTIONS_HINT_LOCALE) ) - aAllSettings.SetLocale( aAllSettings.mpData->maSysLocale.GetOptions().GetLocale() ); + aAllSettings.SetLocale( aAllSettings.mpData->maSysLocale.GetOptions().GetLanguageTag().getLocale() ); Application::SetSettings( aAllSettings ); } |