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

[Caolán McNamara]

 vcl/source/window/builder.cxx |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

New commits:
commit 608272840a799e783fd15197c78bfa2b58145cf4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 16 14:08:24 2018 +0000

    convert any canonical negative gtk responses to our own
    
    Change-Id: Ie51d843061157190003ccbc91b4392409249c6e3
    Reviewed-on: https://gerrit.libreoffice.org/49865
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d36bc390f319..cd7ffe99d051 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3388,6 +3388,30 @@ short VclBuilder::get_response(const vcl::Window *pWindow) const
 
 void VclBuilder::set_response(const OString& sID, short nResponse)
 {
+    switch (nResponse)
+    {
+        case -5:
+            nResponse = RET_OK;
+            break;
+        case -6:
+            nResponse = RET_CANCEL;
+            break;
+        case -7:
+            nResponse = RET_CLOSE;
+            break;
+        case -8:
+            nResponse = RET_YES;
+            break;
+        case -9:
+            nResponse = RET_NO;
+            break;
+        case -11:
+            nResponse = RET_HELP;
+            break;
+    };
+
+    assert(nResponse >= 0);
+
     for (auto & child : m_aChildren)
     {
         if (child.m_sID == sID)