diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-10-11 16:07:37 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-10-12 12:33:11 +0200 |
| commit | b3b9ae6c6fd19b437a5414489a9f38fb310a2843 (patch) | |
| tree | fd83787466b01f0481c610475120c2c7cdfe8def /svx | |
| parent | 6b44a8186da2270ef7d120b97380aabc297be76b (diff) | |
safemode: Add flag to indicate safemode
Change-Id: Ifdbb291715b033eaace159297eac5348530e9f36
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/SafeModeDialog.cxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/crashreportdlg.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index c9f6e4c7fb99..0553436bd673 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -10,9 +10,9 @@ #include "SafeModeDialog.hxx" #include <config_folders.h> - #include <rtl/bootstrap.hxx> #include <osl/file.hxx> +#include <sfx2/safemode.hxx> SafeModeDialog::SafeModeDialog(vcl::Window* pParent): Dialog(pParent, "SafeModeDialog", "svx/ui/safemodedialog.ui") @@ -60,6 +60,7 @@ IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void) { Close(); } + sfx2::SafeMode::removeFlag(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index bbac21157dfb..1692a444fa53 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -15,6 +15,7 @@ #include <rtl/bootstrap.hxx> #include <desktop/crashreport.hxx> #include <desktop/minidump.hxx> +#include <sfx2/safemode.hxx> #include <comphelper/processfactory.hxx> #include <osl/file.hxx> @@ -104,7 +105,7 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void) // Check whether to go to safe mode if (mpCBSafeMode->IsChecked()) { - //TODO: Actually set the safe mode, currently it's only restarting + sfx2::SafeMode::putFlag(); css::uno::Reference< css::uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); css::task::OfficeRestartManager::get(xContext)->requestRestart( css::uno::Reference< css::task::XInteractionHandler >()); |