diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-10-18 13:11:02 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-10-18 14:14:39 +0000 |
| commit | 49de6446bcb20fd5898b2c9e0cca218902c9474d (patch) | |
| tree | a4ecd976c3899fc69510d81d88c9b2ba0613e102 /svx | |
| parent | aaa3072313267c17fa30b56ea7e81e6ac00339c1 (diff) | |
Fix: Quit in SafeModeDialog didn't work properly
Change-Id: I4c093ff02457040ee3752ef6ae4b63cbe5bb3863
Reviewed-on: https://gerrit.libreoffice.org/30006
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/SafeModeDialog.cxx | 12 | ||||
| -rw-r--r-- | svx/source/dialog/SafeModeDialog.hxx | 1 |
2 files changed, 2 insertions, 11 deletions
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index d5a2e6af2c77..55a018c2d1a2 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 f84f94d3d563..815cb1190a48 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); |