[Libreoffice-commits] core.git: vcl/source

[Szymon KÅ‚os (via logerrit)]

 vcl/source/window/dialog.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 758ae9dabb82f531a52f20338aa5d21f84cd47d6
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Feb 27 11:07:42 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Feb 28 09:01:14 2020 +0100

    Close dialog on EndDialog to avoid respawning dead windows
    
    Change-Id: I69cd45871868390dc45265c9754791e711079a0b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89623
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index b1f18b499b80..35a4c8cafa47 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1077,6 +1077,15 @@ void Dialog::EndDialog( long nResult )
 
     Hide();
 
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+        {
+            pNotifier->notifyWindow(GetLOKWindowId(), "close");
+            ReleaseLOKNotifier();
+        }
+    }
+
     if (bModal)
     {
         SetModalInputMode(false);