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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 76f08455e3a7..6636254bd7b8 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -127,7 +127,6 @@ #include <tools/json_writer.hxx> #include <svtools/ctrltool.hxx> #include <svtools/langtab.hxx> -#include <vcl/floatwin.hxx> #include <vcl/fontcharmap.hxx> #include <vcl/graphicfilter.hxx> #ifdef IOS @@ -5467,12 +5466,7 @@ static void doc_postWindow(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWindo if (nAction == LOK_WINDOW_CLOSE) { - bool bWasDialog = vcl::CloseDialog(pWindow); - if (!bWasDialog) - { - if (FloatingWindow* pFloatWin = dynamic_cast<FloatingWindow*>(pWindow.get())) - pFloatWin->EndPopupMode(FloatWinPopupEndFlags::Cancel | FloatWinPopupEndFlags::CloseAll); - } + vcl::CloseTopLevel(pWindow); } else if (nAction == LOK_WINDOW_PASTE) { |