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

[Samuel Mehrbrodt]

 svx/source/dialog/SafeModeDialog.cxx |   12 ++----------
 svx/source/dialog/SafeModeDialog.hxx |    1 -
 2 files changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 49de6446bcb20fd5898b2c9e0cca218902c9474d
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Tue Oct 18 13:11:02 2016 +0200

    Fix: Quit in SafeModeDialog didn't work properly
    
    Change-Id: I4c093ff02457040ee3752ef6ae4b63cbe5bb3863
    Reviewed-on: https://gerrit.libreoffice.org/30006
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index d5a2e6a..55a018c 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -128,15 +128,6 @@ bool SafeModeDialog::Close()
     return Dialog::Close();
 }
 
-void SafeModeDialog::terminateOffice()
-{
-    // We are not hitting Close() in this case, need to manually remove the flag
-    sfx2::SafeMode::removeFlag();
-
-    uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create( comphelper::getProcessComponentContext() );
-    xDesktop->terminate();
-}
-
 void SafeModeDialog::applyChanges()
 {
     if (mpCBCheckProfilesafeConfig->IsChecked())
@@ -208,7 +199,8 @@ IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void)
     }
     else if (pBtn == mpBtnQuit.get())
     {
-        terminateOffice();
+        Close();
+        Application::Quit();
     }
     else if (pBtn == mpBtnRestart.get())
     {
diff --git a/svx/source/dialog/SafeModeDialog.hxx b/svx/source/dialog/SafeModeDialog.hxx
index f84f94d..815cb11 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -47,7 +47,6 @@ private:
     // local BackupFileHelper for handling possible restores
     comphelper::BackupFileHelper maBackupFileHelper;
 
-    static void terminateOffice();
     void applyChanges();
     static void openWebBrowser(const OUString & sURL, const OUString &sTitle);