cui/source/options/optopencl.cxx | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit e7ca62bbd485c5f450e720c8102db2ab9561429f
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
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 776bb0f..e536445 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), VclMessageType::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), VclMessageType::Info);
- aWarnBox->Execute();
}
if (bModified)
+ {
+ ScopedVclPtrInstance<MessageDialog> aWarnBox(this,
CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VclMessageType::Info);
+ aWarnBox->Execute();
batch->commit();
+ }
return bModified;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
