diff options
| author | Eike Rathke <erack@redhat.com> | 2016-12-02 20:10:29 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-12-02 20:36:24 +0100 |
| commit | eb1762fea0c9e281d2bcad2eeffda2a5238816a8 (patch) | |
| tree | 892e5c9b7808898085549c8dcd4766cc78a8ce98 /cui | |
| parent | use SvtSysLocaleOptions::GetRealUILanguageTag(), not GetLocaleConfigString() (diff) | |
| download | core-eb1762fea0c9e281d2bcad2eeffda2a5238816a8.tar.gz core-eb1762fea0c9e281d2bcad2eeffda2a5238816a8.zip | |
use SvtSysLocaleOptions::GetLanguageTag() instead of GetLocaleConfigString()
Change-Id: Ifcfc4588d5bd6f713a40bd2300740f7a1c52337c
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index e308843eb438..07ed58006f65 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1400,9 +1400,9 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\""); } - OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); - LanguageType eOldLocale = (!sLang.isEmpty() ? - LanguageTag::convertToLanguageTypeWithFallback( sLang ) : LANGUAGE_SYSTEM); + LanguageTag aLanguageTag( pLangConfig->aSysLocaleOptions.GetLanguageTag()); + LanguageType eOldLocale = (aLanguageTag.isSystemLocale() ? LANGUAGE_SYSTEM : + aLanguageTag.makeFallback().getLanguageType()); LanguageType eNewLocale = m_pLocaleSettingLB->GetSelectLanguage(); // If the "Default ..." entry was selected that means SYSTEM, the actual @@ -1569,11 +1569,11 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) { - OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); - if ( !sLang.isEmpty() ) - m_pLocaleSettingLB->SelectLanguage(LanguageTag::convertToLanguageTypeWithFallback(sLang)); - else + LanguageTag aLanguageTag( pLangConfig->aSysLocaleOptions.GetLanguageTag()); + if ( aLanguageTag.isSystemLocale() ) m_pLocaleSettingLB->SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG ); + else + m_pLocaleSettingLB->SelectLanguage( aLanguageTag.makeFallback().getLanguageType()); bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE); m_pLocaleSettingLB->Enable(!bReadonly); m_pLocaleSettingFT->Enable(!bReadonly); @@ -1594,10 +1594,10 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) OUString aAbbrev; LanguageType eLang; const NfCurrencyEntry* pCurr = nullptr; - sLang = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString(); - if ( !sLang.isEmpty() ) + OUString sCurrency = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString(); + if ( !sCurrency.isEmpty() ) { - SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( aAbbrev, eLang, sLang ); + SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( aAbbrev, eLang, sCurrency ); pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang ); } // if pCurr==NULL the SYSTEM entry is selected |