diff options
Diffstat (limited to 'svx/source/dialog/SafeModeDialog.cxx')
-rw-r--r-- | svx/source/dialog/SafeModeDialog.cxx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index b77b83fe680a..51de5481882c 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -37,8 +37,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) : Dialog(pParent, "SafeModeDialog", "svx/ui/safemodedialog.ui"), mpBtnContinue(), - mpBtnQuit(), mpBtnRestart(), + mpBtnApply(), mpBoxRestore(), mpBoxConfigure(), @@ -63,8 +63,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) maBackupFileHelper() { get(mpBtnContinue, "btn_continue"); - get(mpBtnQuit, "btn_quit"); get(mpBtnRestart, "btn_restart"); + get(mpBtnApply, "btn_apply"); get(mpBoxRestore, "group_restore"); get(mpBoxConfigure, "group_configure"); @@ -96,8 +96,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) mpRadioReset->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl)); - mpBtnQuit->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl)); mpBtnRestart->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl)); + mpBtnApply->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl)); mpCBCheckProfilesafeConfig->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); mpCBCheckProfilesafeExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); @@ -112,7 +112,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) mpBtnCreateZip->SetClickHdl(LINK(this, SafeModeDialog, CreateZipBtnHdl)); // Disable restart btn until some checkbox is active - mpBtnRestart->Disable(); + mpBtnApply->Disable(); // Check the first radio button and disable the other parts mpRadioRestore->Check(); @@ -146,8 +146,8 @@ void SafeModeDialog::dispose() mpBoxReset.clear(); mpBtnContinue.clear(); - mpBtnQuit.clear(); mpBtnRestart.clear(); + mpBtnApply.clear(); mpCBCheckProfilesafeConfig.clear(); mpCBCheckProfilesafeExtensions.clear(); @@ -319,12 +319,15 @@ IMPL_LINK(SafeModeDialog, DialogBtnHdl, Button*, pBtn, void) { Close(); } - else if (pBtn == mpBtnQuit.get()) + else if (pBtn == mpBtnRestart.get()) { + sfx2::SafeMode::putRestartFlag(); Close(); - Application::Quit(); + uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); + css::task::OfficeRestartManager::get(xContext)->requestRestart( + css::uno::Reference< css::task::XInteractionHandler >()); } - else if (pBtn == mpBtnRestart.get()) + else if (pBtn == mpBtnApply.get()) { sfx2::SafeMode::putRestartFlag(); Close(); @@ -395,7 +398,7 @@ IMPL_LINK(SafeModeDialog, CheckBoxHdl, CheckBox&, /*pCheckBox*/, void) mpCBResetCustomizations->IsChecked() || mpCBResetWholeUserProfile->IsChecked()); - mpBtnRestart->Enable(bEnable); + mpBtnApply->Enable(bEnable); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |