diff options
| author | Justin Luth <justin_luth@sil.org> | 2021-12-02 14:38:53 +0200 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2021-12-03 16:29:40 +0100 |
| commit | 3c10bb151e5864c0ff532910b9f81185aa49c21f (patch) | |
| tree | eb3ccf05452964921a44ff2714c656f967b51740 /svx/source/dialog | |
| parent | fc1e5202cbfb36b28b0e597811f39895c19ae6ba (diff) | |
tdf#129629 sw UI: Find/replace - stop popping open MORE section
This was a regression from LO 6.1, where it would always
show the "more" options if one of them was enabled.
That might be fine for the dialog initialization
(and that is how I implemented it)
but even that is a bit much. Perhaps it should be a
search option that is remembered while the application
is running. Is that what pSearchOptions holds?
Anyway, this much I can easily figure out.
Someone who knows more about these things
can enhance it further if they want.
Change-Id: I8288bea514840f4ea06deb00a3603aa9568a75b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126226
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index ba5def14777e..f2c506c62ba3 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -800,8 +800,6 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) m_xIncludeDiacritics->set_active( !aOpt.IsIgnoreDiacritics_CTL() ); if ( m_xIncludeKashida->get_visible() ) m_xIncludeKashida->set_active( !aOpt.IsIgnoreKashida_CTL() ); - if ( SvxSearchDialog::IsOtherOptionsExpanded() ) - m_xOtherOptionsExpander->set_expanded( true ); ApplyTransliterationFlags_Impl( pSearchItem->GetTransliterationFlags() ); ShowOptionalControls_Impl(); @@ -1754,8 +1752,12 @@ void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags ) } if ( pSearchItem ) + { Init_Impl( pSearchItem->GetPattern() && ( !pSearchList || !pSearchList->Count() ) ); + if (SvxSearchDialog::IsOtherOptionsExpanded()) + m_xOtherOptionsExpander->set_expanded(true); + } } void SvxSearchDialog::EnableControl_Impl(const weld::Widget& rCtrl) |