diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-08 17:04:49 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:22:15 +0200 |
| commit | d8ceefaf41420b020f4ea594f2dc0adae766af09 (patch) | |
| tree | a92739a2c1ff30a2c68c21ccf8fa9fbf2140c547 /cui | |
| parent | 09abb0aaa77db57940e0c2e94ba732e5673d8d76 (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 'cui')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 5 | ||||
| -rw-r--r-- | cui/source/options/optjsearch.cxx | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 893ab5338d86..5de00a6360b6 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1511,8 +1511,9 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) if ( m_pCTLSupportCB->IsValueChangedFromSaved() ) { SvtSearchOptions aOpt; - aOpt.SetIgnoreDiacritics_CTL (true); - aOpt.SetIgnoreKashida_CTL (true); + aOpt.SetIgnoreDiacritics_CTL(true); + aOpt.SetIgnoreKashida_CTL(true); + aOpt.Commit(); pLangConfig->aLanguageOptions.SetCTLFontEnabled( m_pCTLSupportCB->IsChecked() ); const sal_uInt16 STATE_COUNT = 1; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 2bd5401acac5..9ef64992a245 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -380,10 +380,10 @@ bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet* ) bModified = true; } + if (bModified) + aOpt.Commit(); + return bModified; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |