diff options
| author | Eike Rathke <erack@redhat.com> | 2022-10-23 22:12:40 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2022-10-24 00:37:58 +0200 |
| commit | 6d2363a553c9e275f9430510d70bc4b84e02aad8 (patch) | |
| tree | d1630356d7b3c70c4a144ce1938af9606bdb3ef9 | |
| parent | 648c70ac2caf2646ee8ff49bd8d846016d289b38 (diff) | |
Related: tdf#147817 validateDatePatterns() also when (re-)setting/initializing
... so a bad pattern possibly stored in configuration gives a
visual indicator already on first view.
Also reset the edit indicator to normal when initializing from a
locale's default patterns.
Change-Id: Ib87b01e057bc1409eba6ccb4d2717a731d0773d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141689
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 38b6ae8181e6..db81f8565923 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1508,10 +1508,17 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) { const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); aDatePatternsString = lcl_getDatePatternsConfigString( rLocaleWrapper); + // Let's assume patterns are valid at this point. + m_bDatePatternsValid = true; + } + else + { + bool bModified = false; + m_bDatePatternsValid = validateDatePatterns( bModified, aDatePatternsString); } - // Let's assume patterns are valid at this point. - m_bDatePatternsValid = true; m_xDatePatternsED->set_text(aDatePatternsString); + m_xDatePatternsED->set_message_type( m_bDatePatternsValid ? + weld::EntryMessageType::Normal : weld::EntryMessageType::Error); bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::EOption::DatePatterns); m_xDatePatternsED->set_sensitive(!bReadonly); m_xDatePatternsFT->set_sensitive(!bReadonly); @@ -1691,6 +1698,7 @@ IMPL_LINK_NOARG(OfaLanguagesTabPage, LocaleSettingHdl, weld::ComboBox&, void) OUString aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper); m_bDatePatternsValid = true; m_xDatePatternsED->set_text( aDatePatternsString); + m_xDatePatternsED->set_message_type(weld::EntryMessageType::Normal); } IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, weld::Entry&, rEd, void ) |