diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-08 17:04:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-08 17:35:27 +0100 |
| commit | f5607ec73e8a54bdde7d1b5280c96ef69484ff16 (patch) | |
| tree | a1c6e6ed0db10adf9936f992ecfdb34b5b21f235 /svx | |
| parent | 079ef12f13d0fcc658127568c7f1e184bb350893 (diff) | |
add (and call before dtor) Commit to SvtSearchOptions
i.e. follow up to
commit 465359c35fcd8c30a2bedd3d0beb07c0c1c36cba
Author: Michael Stahl <mstahl@redhat.com>
Date: Wed Mar 11 16:39:24 2015 +0100
do not call virtual Commit() from dtors of utl::ConfigItem subclasses
~SvtAppFilterOptions_Impl() demonstrates that this is a bad idea, by not
invoking its subclasses' ImplCommit() but its own.
to avoid assert in SvtSearchOptions dtor
Change-Id: I0eaf93450e1daddb81a9463f2c1df48a334dfb22
(cherry picked from commit 8d5a2116bc198f51ee394ca48c48f04ef4ba1658)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index be442144fb39..b9c38ff8639a 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -564,6 +564,7 @@ bool SvxSearchDialog::Close() aOpt.SetNotes ( m_pNotesBtn->IsChecked() ); aOpt.SetIgnoreDiacritics_CTL ( m_pIgnoreDiacritics->IsChecked() ); aOpt.SetIgnoreKashida_CTL ( m_pIgnoreKashida->IsChecked() ); + aOpt.Commit(); const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SfxCallMode::SLOT, ppArgs ); @@ -2218,6 +2219,7 @@ void SvxSearchDialog::SaveToModule_Impl() SvtSearchOptions aOpt; aOpt.SetIgnoreDiacritics_CTL(GetCheckBoxValue(m_pIgnoreDiacritics)); aOpt.SetIgnoreKashida_CTL(GetCheckBoxValue(m_pIgnoreKashida)); + aOpt.Commit(); sal_Int32 nFlags = GetTransliterationFlags(); if( !pSearchItem->IsUseAsianOptions()) |