From 71da8dd7d710f9038586800d3d9ac848d064c911 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 26 Feb 2021 12:14:03 +0000
Subject: move lok FloatingWindow closing code to vcl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 vcl/source/window/dialog.cxx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'vcl')

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);
     }
 }
 
-- 
cgit