[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source sw/uiconfig

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/textsh1.cxx          |    2 +-
 sw/uiconfig/swriter/ui/queryredlinedialog.ui |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 821a1315dc490766976cf73436f0cf084980275e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 16 10:52:54 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Jul 17 10:49:08 2019 +0200

    Related: tdf#126236 keep user defined responses out of ambiguous range
    
    Change-Id: I6481f40ba5f50c3d76978b0f4a477f1d0b9adc99
    Reviewed-on: https://gerrit.libreoffice.org/75704
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 92a62f64a55b..187c70279697 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -739,7 +739,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     rReq.Ignore();
                     break;
 
-                case 2:
+                case 102:
                     xDlg->Execute();
                     rReq.Done();
                     break;
diff --git a/sw/uiconfig/swriter/ui/queryredlinedialog.ui b/sw/uiconfig/swriter/ui/queryredlinedialog.ui
index 490d09a7ebbc..8a9780720af6 100644
--- a/sw/uiconfig/swriter/ui/queryredlinedialog.ui
+++ b/sw/uiconfig/swriter/ui/queryredlinedialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.2 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkMessageDialog" id="QueryRedlineDialog">
@@ -75,10 +75,7 @@ or accept or reject particular changes.</property>
     <action-widgets>
       <action-widget response="-6">cancel</action-widget>
       <action-widget response="-5">ok</action-widget>
-      <action-widget response="2">edit</action-widget>
+      <action-widget response="102">edit</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>