cui/source/options/optopencl.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
New commits: commit 93440e1c1237a2237e8a3b8914514d8889bb6172 Author: Tor Lillqvist <t...@collabora.com> Date: Mon Jun 27 10:28:55 2016 +0300 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 <c...@libreoffice.org> Reviewed-by: Eike Rathke <er...@redhat.com> diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index f055ed0..2bf4cfe 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; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits