[Libreoffice-commits] core.git: include/svtools svtools/uiconfig uui/source uui/uiconfig

Caolán McNamara caolanm at redhat.com
Mon Feb 19 13:45:41 UTC 2018


 include/svtools/fileview.hxx             |    2 +-
 svtools/uiconfig/ui/querydeletedialog.ui |    4 ++--
 uui/source/sslwarndlg.cxx                |    2 +-
 uui/uiconfig/ui/sslwarndialog.ui         |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8ed356fb69e024218538c4818ea6ad46799b2c68
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 19 09:04:04 2018 +0000

    reserve negative responses for internal responses
    
    Change-Id: Iecf7d25340ff751c2984e27fdd303d2162472344
    Reviewed-on: https://gerrit.libreoffice.org/49971
    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/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 8e1d14df36fc..617dd1853612 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -206,7 +206,7 @@ namespace svtools {
 enum QueryDeleteResult_Impl
 {
     QUERYDELETE_YES = RET_YES,
-    QUERYDELETE_ALL = -1
+    QUERYDELETE_ALL = 101
 };
 
 class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public MessageDialog
diff --git a/svtools/uiconfig/ui/querydeletedialog.ui b/svtools/uiconfig/ui/querydeletedialog.ui
index 1168f0da5091..de2e3d102235 100644
--- a/svtools/uiconfig/ui/querydeletedialog.ui
+++ b/svtools/uiconfig/ui/querydeletedialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteDialog">
@@ -92,7 +92,7 @@
     </child>
     <action-widgets>
       <action-widget response="2">yes</action-widget>
-      <action-widget response="-1">all</action-widget>
+      <action-widget response="101">all</action-widget>
       <action-widget response="3">no</action-widget>
       <action-widget response="0">cancel</action-widget>
     </action-widgets>
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index b85e376ff291..f88284a70610 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -50,7 +50,7 @@ void SSLWarnDialog::response(short nResponseId)
 {
     switch (nResponseId)
     {
-        case -1:
+        case 101:
             ViewCert();
             break;
         default:
diff --git a/uui/uiconfig/ui/sslwarndialog.ui b/uui/uiconfig/ui/sslwarndialog.ui
index e93112399ac0..2a3d857816a3 100644
--- a/uui/uiconfig/ui/sslwarndialog.ui
+++ b/uui/uiconfig/ui/sslwarndialog.ui
@@ -75,7 +75,7 @@
     <action-widgets>
       <action-widget response="1">ok</action-widget>
       <action-widget response="0">cancel</action-widget>
-      <action-widget response="-1">view</action-widget>
+      <action-widget response="101">view</action-widget>
     </action-widgets>
   </object>
 </interface>


More information about the Libreoffice-commits mailing list