summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-06-27 10:28:55 +0300
committerAndras Timar <andras.timar@collabora.com>2016-07-04 15:52:55 +0200
commitad2debcefa7a2669004155e58b3afdda70ba7434 (patch)
tree83009fa5764e1dabb3c973b581b978f3a30e54d1 /cui
parent34dbeaed44df03a57faa346d1a7e7e0a0205476d (diff)
tdf#100222: Show the dialog just once even if both toggles were changed
Change-Id: If6058d68f80ebc3e235f0a681cfe3240985e2429 Reviewed-on: https://gerrit.libreoffice.org/26697 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 93440e1c1237a2237e8a3b8914514d8889bb6172)
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/optopencl.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index f055ed057b07..2bf4cfecf673 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -155,9 +155,6 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
{
officecfg::Office::Common::Misc::UseSwInterpreter::set(mpUseSwInterpreter->IsChecked(), batch);
bModified = true;
-
- ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO);
- aWarnBox->Execute();
}
if (mpUseOpenCL->IsValueChangedFromSaved())
@@ -167,13 +164,14 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
{
maConfig.set();
bModified = true;
-
- ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO);
- aWarnBox->Execute();
}
if (bModified)
+ {
+ ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO);
+ aWarnBox->Execute();
batch->commit();
+ }
return bModified;
}