From 29eb1ceeae4a3108ce134b45e77a37ade7d7a4f8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 9 Feb 2017 10:11:36 +0200 Subject: convert SvtSysLocaleOptions::EOption to scoped enum and drop unused E_UILOCALE enumerator Change-Id: Ic9bdac91fab15af45e7dbd613e6e44b73b5cf9de Reviewed-on: https://gerrit.libreoffice.org/34066 Tested-by: Jenkins Reviewed-by: Noel Grandin --- cui/source/options/optgdlg.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cui') diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 3e14eea080cb..607b14072e49 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1573,7 +1573,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) 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::EOption::Locale); m_pLocaleSettingLB->Enable(!bReadonly); m_pLocaleSettingFT->Enable(!bReadonly); @@ -1602,7 +1602,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) // if pCurr==NULL the SYSTEM entry is selected const sal_Int32 nPos = m_pCurrencyLB->GetEntryPos( static_cast(pCurr) ); m_pCurrencyLB->SelectEntryPos( nPos ); - bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_CURRENCY); + bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::EOption::Currency); m_pCurrencyLB->Enable(!bReadonly); m_pCurrencyFT->Enable(!bReadonly); @@ -1616,7 +1616,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) // Let's assume patterns are valid at this point. m_bDatePatternsValid = true; m_pDatePatternsED->SetText( aDatePatternsString); - bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_DATEPATTERNS); + bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::EOption::DatePatterns); m_pDatePatternsED->Enable(!bReadonly); m_pDatePatternsFT->Enable(!bReadonly); m_pDatePatternsED->SaveValue(); -- cgit