diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-06-14 09:18:44 +0100 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-05-01 17:58:17 +0200 |
commit | 64317b35feee9c4e1dfbe7d1e580c2146ad652bb (patch) | |
tree | c7ac28b57f0c03b47b4eec731c3bf8e95b032e0f /include | |
parent | 872ee053d3c75ca47fbd29f4504d1bd5c21b05df (diff) |
disable 'quit' menu entry when modal dialog waiting response
Traditionally when a modal dialog is active, the quit menu entry of all
LibreOffice toplevel frames, not just those which are themselves modal, is get
disabled.
This has come unstuck because its implemented by dialogs emitting
MouseNotifyEvent::[END]EXECUTEDIALOG on its parent, and SfxFrameWindow_Impl
listening for that event. But if the dialog parent is the toplevel parent of
SfxFrameWindow_Impl then it doesn't get seen by the SfxFrameWindow_Impl child.
Change-Id: I0c4a5472d16d9169e68f6b0c230d039f1119489a
Reviewed-on: https://gerrit.libreoffice.org/74030
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ca525d1375ab06889ba1cf9d904652f2eb61d1bf)
Conflicts:
include/vcl/event.hxx
include/vcl/window.hxx
sfx2/source/view/frame2.cxx
vcl/source/window/dialog.cxx
vcl/source/window/window.cxx
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/window.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 3a3ea99d2c0f..f0eaaff573f1 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1605,6 +1605,7 @@ public: virtual bool IsChart() const { return false; } void SetHelpHdl(const Link<vcl::Window&, bool>& rLink); + void SetModalHierarchyHdl(const Link<bool, void>& rLink); }; } |