mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use SvtSysLocaleOptions::GetLanguageTag() instead of GetLocaleConfigString()

Browse Source 
Change-Id: Ifcfc4588d5bd6f713a40bd2300740f7a1c52337c
This commit is contained in:
Eike Rathke
2016-12-02 20:10:29 +01:00
parent 7523b3b3c5
commit eb1762fea0
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cui/source/options/optgdlg.cxx
View File

@@ -1400,9 +1400,9 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\""); SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\"");
} }
OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); LanguageTag aLanguageTag( pLangConfig->aSysLocaleOptions.GetLanguageTag());
LanguageType eOldLocale = (!sLang.isEmpty() ? LanguageType eOldLocale = (aLanguageTag.isSystemLocale() ? LANGUAGE_SYSTEM :
LanguageTag::convertToLanguageTypeWithFallback( sLang ) : LANGUAGE_SYSTEM); aLanguageTag.makeFallback().getLanguageType());
LanguageType eNewLocale = m_pLocaleSettingLB->GetSelectLanguage(); LanguageType eNewLocale = m_pLocaleSettingLB->GetSelectLanguage();
// If the "Default ..." entry was selected that means SYSTEM, the actual // 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 ) void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
{ {
OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); LanguageTag aLanguageTag( pLangConfig->aSysLocaleOptions.GetLanguageTag());
if ( !sLang.isEmpty() ) if ( aLanguageTag.isSystemLocale() )
m_pLocaleSettingLB->SelectLanguage(LanguageTag::convertToLanguageTypeWithFallback(sLang));
else
m_pLocaleSettingLB->SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG ); m_pLocaleSettingLB->SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG );
else
m_pLocaleSettingLB->SelectLanguage( aLanguageTag.makeFallback().getLanguageType());
bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE); bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE);
m_pLocaleSettingLB->Enable(!bReadonly); m_pLocaleSettingLB->Enable(!bReadonly);
m_pLocaleSettingFT->Enable(!bReadonly); m_pLocaleSettingFT->Enable(!bReadonly);
@@ -1594,10 +1594,10 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
OUString aAbbrev; OUString aAbbrev;
LanguageType eLang; LanguageType eLang;
const NfCurrencyEntry* pCurr = nullptr; const NfCurrencyEntry* pCurr = nullptr;
sLang = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString(); OUString sCurrency = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
if ( !sLang.isEmpty() ) if ( !sCurrency.isEmpty() )
{ {
SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( aAbbrev, eLang, sLang ); SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( aAbbrev, eLang, sCurrency );
pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang ); pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang );
} }
// if pCurr==NULL the SYSTEM entry is selected // if pCurr==NULL the SYSTEM entry is selected