diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-02 17:23:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-03 22:05:57 +0100 |
| commit | fdcd11ff68fcd9e46aad6efc20779a063f4f6182 (patch) | |
| tree | e0a28c7599e66334debb6f57fb4713e3ed4fd541 /vcl | |
| parent | 7cca1dc560aeceb430ef6a0db2f7823e717ee585 (diff) | |
Resolves: tdf#113160 changing all warning dialogs to non-modal is unsafe
existing code doesn't expect that so stuff crashes
partial revert of...
commit db6b703d391838c481fd090065f6d329edcd4efa
Date: Thu Aug 24 18:32:38 2017 +0200
Allow non-modal Dialogs during FileImport/Load
Change-Id: I152feb849186cf035664a700d3f94ee049cdf6d3
Reviewed-on: https://gerrit.libreoffice.org/44227
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 16 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/window/msgbox.cxx | 6 |
3 files changed, 4 insertions, 28 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index ad5beddb1c83..351a5bfa2f77 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1642,20 +1642,4 @@ void Application::setDeInitHook(Link<LinkParamNone*,void> const & hook) { pSVData->maAppData.mbInAppMain = true; } -void Application::SetShutdownDelayed() -{ - ImplSVData * pSVData = ImplGetSVData(); - pSVData->maAppData.mbShutdownDelayed = true; -} - -void Application::TriggerShutdownDelayed() -{ - ImplSVData * pSVData = ImplGetSVData(); - - if (pSVData->maAppData.mbShutdownDelayed && !Dialog::AreDialogsOpen()) - { - Application::PostUserEvent(LINK(nullptr, ImplSVAppData, ImplPrepareExitMsg)); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 43e3ff7362ff..9be733fbb4d0 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -412,7 +412,7 @@ void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag ) // Now, all Dialogs are per default system windows !!! nStyle |= WB_SYSTEMWINDOW; - if (InitFlag::NoParent == eFlag || InitFlag::NoParentCentered == eFlag) + if (InitFlag::NoParent == eFlag) { pParent = nullptr; } @@ -1179,14 +1179,6 @@ void Dialog::EndAllDialogs( vcl::Window const * pParent ) } } -bool Dialog::AreDialogsOpen() -{ - ImplSVData* pSVData = ImplGetSVData(); - Dialog* pModDialog = pSVData->maWinData.mpLastExecuteDlg; - - return (nullptr != pModDialog); -} - void Dialog::SetModalInputMode( bool bModal ) { if ( bModal == mbModalMode ) diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 8b9f4b515130..67b3edf1df37 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -122,15 +122,15 @@ void MessBox::ImplInitButtons() } } -MessBox::MessBox( vcl::Window* pParent, MessBoxStyle nMessBoxStyle, WinBits nWinBits, - const OUString& rTitle, const OUString& rMessage, Dialog::InitFlag eInitFlag) : +MessBox::MessBox(vcl::Window* pParent, MessBoxStyle nMessBoxStyle, WinBits nWinBits, + const OUString& rTitle, const OUString& rMessage) : ButtonDialog( WindowType::MESSBOX ), mbHelpBtn( false ), mbCheck( false ), mnMessBoxStyle( nMessBoxStyle ), maMessText( rMessage ) { - ImplInit( pParent, nWinBits | WB_MOVEABLE | WB_HORZ | WB_CENTER, eInitFlag); + ImplInit(pParent, nWinBits | WB_MOVEABLE | WB_HORZ | WB_CENTER); ImplInitButtons(); if ( !rTitle.isEmpty() ) |