[Libreoffice-commits] core.git: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optgdlg.cxx   |    7 ++++---
 cui/source/options/optinet2.cxx  |    3 ++-
 cui/source/options/optopencl.cxx |    5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit e961e08a3277158d4e3074bfacb8599296d2fa75
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Jan 21 17:00:52 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue Jan 22 10:17:57 2019 +0100

    tdf#122846: Close option dialog if restart is confirmed
    
    use the same logic as 0fa14d58457e9418ff756a0efd66e365c4403a67
    
    Change-Id: I485cb232bb787e176918caf2eee74b0fbb360e47
    Reviewed-on: https://gerrit.libreoffice.org/66691
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 80cb1cb442a7..d0c937398369 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -958,9 +958,10 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
         m_pForceOpenGL->IsValueChangedFromSaved())
     {
         SolarMutexGuard aGuard;
-        svtools::executeRestartDialog(
-            comphelper::getProcessComponentContext(), nullptr,
-            svtools::RESTART_REASON_OPENGL);
+        if( svtools::executeRestartDialog(
+                comphelper::getProcessComponentContext(), nullptr,
+                svtools::RESTART_REASON_OPENGL))
+            GetParentDialog()->EndDialog(RET_OK);
     }
 
     return bModified;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 59d0dd663236..0bdcaac701e0 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -804,7 +804,8 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, Button*, void)
     if (nRet == RET_OK && sOrig != mpCertPathDlg->getDirectory())
     {
         SolarMutexGuard aGuard;
-        svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_ADDING_PATH);
+        if (svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_ADDING_PATH))
+            GetParentDialog()->EndDialog(RET_OK);
     }
 }
 
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 3535711e6f38..6a568903ae89 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -94,8 +94,9 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
     {
         batch->commit();
         SolarMutexGuard aGuard;
-        svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr,
-                                      svtools::RESTART_REASON_OPENCL);
+        if (svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr,
+                                      svtools::RESTART_REASON_OPENCL))
+            GetParentDialog()->EndDialog(RET_OK);
     }
 
     return bModified;