diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-26 12:14:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-26 20:58:06 +0100 |
| commit | 71da8dd7d710f9038586800d3d9ac848d064c911 (patch) | |
| tree | 1e1edb5e88961c1698215f94485dd414efb3743b /vcl | |
| parent | a5a71c7bb58a16a64c586c3ea142e0dd88cf7104 (diff) | |
move lok FloatingWindow closing code to vcl
Change-Id: I8e2c29e2c6450f79a7b80262f290b6afd13db7f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111627
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index d65ac881aa30..3bfdbe1c4bb4 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -43,6 +43,7 @@ #include <vcl/abstdlg.hxx> #include <vcl/accel.hxx> #include <vcl/builder.hxx> +#include <vcl/floatwin.hxx> #include <vcl/layout.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> @@ -1201,14 +1202,12 @@ namespace vcl } } - bool CloseDialog(vcl::Window* pWindow) + void CloseTopLevel(vcl::Window* pWindow) { if (Dialog* pDialog = dynamic_cast<Dialog*>(pWindow)) - { pDialog->Close(); - return true; - } - return false; + else if (FloatingWindow* pFloatWin = dynamic_cast<FloatingWindow*>(pWindow)) + pFloatWin->EndPopupMode(FloatWinPopupEndFlags::Cancel | FloatWinPopupEndFlags::CloseAll); } } |