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 /include/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 'include/vcl')
| -rw-r--r-- | include/vcl/dialog.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/msgbox.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 6 |
3 files changed, 4 insertions, 15 deletions
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index d7d7ce292cf6..d28ff0ac6d64 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -39,11 +39,8 @@ public: /** Use given parent or get a default one using GetDefaultParent(...) */ Default, - /** Suppress Parent so that Parent is not blocked (kind of modal mode) */ - NoParent, - - /** Suppress Parent (no modal, see above) and additionally center on default parent */ - NoParentCentered + /** No Parent */ + NoParent }; private: @@ -168,7 +165,6 @@ public: void EndDialog( long nResult = 0 ); static void EndAllDialogs( vcl::Window const * pParent ); - static bool AreDialogsOpen(); void GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index 7c377170566c..18b869318b90 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -69,9 +69,8 @@ protected: SAL_DLLPRIVATE void ImplPosControls(); public: - MessBox( vcl::Window* pParent, MessBoxStyle nMessBoxStyle, WinBits n, - const OUString& rTitle, const OUString& rMessage, - Dialog::InitFlag eInitFlag = Dialog::InitFlag::NoParentCentered); + MessBox(vcl::Window* pParent, MessBoxStyle nMessBoxStyle, WinBits n, + const OUString& rTitle, const OUString& rMessage); virtual ~MessBox() override; virtual void dispose() override; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index e895dde09a7d..dd10349a41b2 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1384,12 +1384,6 @@ public: // For vclbootstrapprotector: static void setDeInitHook(Link<LinkParamNone*,void> const & hook); - // for delayed shutdown: set using SetShutdownDelayed, then - // trigger using TriggerShutdownDelayed which may actually shutdown - // when SetShutdownDelayed is set - static void SetShutdownDelayed(); - static void TriggerShutdownDelayed(); - private: DECL_STATIC_LINK( Application, PostEventHandler, void*, void ); }; |