mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete the safemode flag when closing the dialog

Browse Source 
Change-Id: I7131849cc417155b55425eba1494992f7d07fa0b
This commit is contained in:
Samuel Mehrbrodt
2016-10-12 11:18:08 +02:00
parent d690066575
commit 2811e4215a
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
svx/source/dialog/SafeModeDialog.cxx
View File

@@ -46,6 +46,14 @@ void SafeModeDialog::dispose()
Dialog::dispose(); Dialog::dispose();
} }
bool SafeModeDialog::Close()
{
// Remove the safe mode flag before exiting this dialog
sfx2::SafeMode::removeFlag();
return Dialog::Close();
}
IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void) IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void)
{ {
if (pBtn == mpBtnContinue.get()) if (pBtn == mpBtnContinue.get())
@@ -60,7 +68,6 @@ IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void)
{ {
Close(); Close();
} }
sfx2::SafeMode::removeFlag();
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
svx/source/dialog/SafeModeDialog.hxx
View File

@@ -26,6 +26,8 @@ public:
virtual void dispose() override; virtual void dispose() override;
virtual bool Close() override;
private: private:
VclPtr<Button> mpBtnContinue; VclPtr<Button> mpBtnContinue;