summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-10-12 16:48:49 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-10-12 16:53:03 +0200
commit18a4aa3f70419e3b51a324912d0444eecf92dbd6 (patch)
tree5bd7a01b2e9db321f34ef6660f53e2cd605d77ae /svx
parent53bba96ac0c76e2971532d13a09d9fd90b3299c7 (diff)
SafeModeDialog: Remove flag also when exiting
Change-Id: I5d1bf17ace062f07287d3b3427eaab144ea7c0f8
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/SafeModeDialog.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index 1da58a00d44b..53d99119e51d 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -71,6 +71,9 @@ bool SafeModeDialog::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();
}