Kaydet (Commit) e0480c81 authored tarafından Eike Rathke's avatar Eike Rathke

do not store invalid date acceptance patterns in configuration

Change-Id: I78cd8b304db2243fd105d4b13421b6ea0347e042
üst 3d79d4ae
...@@ -1298,7 +1298,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) ...@@ -1298,7 +1298,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// Configured date acceptance patterns, for example Y-M-D;M-D or empty for // Configured date acceptance patterns, for example Y-M-D;M-D or empty for
// locale default. // locale default.
if (m_pDatePatternsED->IsValueChangedFromSaved()) if (m_bDatePatternsValid && m_pDatePatternsED->IsValueChangedFromSaved())
pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( m_pDatePatternsED->GetText()); pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( m_pDatePatternsED->GetText());
SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
...@@ -1463,6 +1463,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) ...@@ -1463,6 +1463,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
aDatePatternsString = lcl_getDatePatternsConfigString( rLocaleWrapper); aDatePatternsString = lcl_getDatePatternsConfigString( rLocaleWrapper);
} }
// Let's assume patterns are valid at this point.
m_bDatePatternsValid = true;
m_pDatePatternsED->SetText( aDatePatternsString); m_pDatePatternsED->SetText( aDatePatternsString);
bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_DATEPATTERNS); bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_DATEPATTERNS);
m_pDatePatternsED->Enable(!bReadonly); m_pDatePatternsED->Enable(!bReadonly);
...@@ -1659,6 +1661,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) ...@@ -1659,6 +1661,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox )
// update the date acceptance patterns // update the date acceptance patterns
OUString aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper); OUString aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper);
m_bDatePatternsValid = true;
m_pDatePatternsED->SetText( aDatePatternsString); m_pDatePatternsED->SetText( aDatePatternsString);
return 0; return 0;
...@@ -1770,6 +1773,7 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd ) ...@@ -1770,6 +1773,7 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd )
pEd->SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0))); pEd->SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
#endif #endif
} }
m_bDatePatternsValid = bValid;
return 0; return 0;
} }
......
...@@ -157,6 +157,8 @@ class OfaLanguagesTabPage : public SfxTabPage ...@@ -157,6 +157,8 @@ class OfaLanguagesTabPage : public SfxTabPage
OUString m_sUserLocaleValue; OUString m_sUserLocaleValue;
OUString m_sSystemDefaultString; OUString m_sSystemDefaultString;
bool m_bDatePatternsValid;
DECL_LINK( SupportHdl, CheckBox* ) ; DECL_LINK( SupportHdl, CheckBox* ) ;
DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ; DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ;
DECL_LINK( DatePatternsHdl, Edit* ) ; DECL_LINK( DatePatternsHdl, Edit* ) ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment