[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a4a523aadea5c966223955517049c1246872aad9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 18 16:33:34 2018 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jul 19 12:19:22 2018 +0200

    Resolves: tdf#118802 map GTK_RESPONSE_DELETE_EVENT to RET_CANCEL
    
    Change-Id: I8285f329e4672c90f47d96ccffe60c21c565dde7
    Reviewed-on: https://gerrit.libreoffice.org/57656
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 89655fd1b654..10610c089b4d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2031,6 +2031,8 @@ private:
             ret = RET_OK;
         else if (ret == GTK_RESPONSE_CANCEL)
             ret = RET_CANCEL;
+        else if (ret == GTK_RESPONSE_DELETE_EVENT)
+            ret = RET_CANCEL;
         else if (ret == GTK_RESPONSE_CLOSE)
             ret = RET_CLOSE;
         else if (ret == GTK_RESPONSE_YES)