From 53d4cd70a51a0cf38af03a4c113fe201679e207b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 7 Oct 2020 19:37:39 +0100
Subject: we only should have one has_default==True in these dialogs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

undo the part of 3d056824c687df567c05bf31554fa40ea2baef18
to restore the part of c9e3952e76a9c06d5a1d2f583829ce9eb5b9df64.
where the code does no special show/hide of buttons

Change-Id: Iacc37e5250468f2b626c3212c30bdd254966fdb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104067
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 cui/uiconfig/ui/certdialog.ui                | 1 -
 cui/uiconfig/ui/tsaurldialog.ui              | 2 --
 dbaccess/uiconfig/ui/collectionviewdialog.ui | 3 ---
 sfx2/uiconfig/ui/versioncommentdialog.ui     | 1 -
 4 files changed, 7 deletions(-)

diff --git a/cui/uiconfig/ui/certdialog.ui b/cui/uiconfig/ui/certdialog.ui
index 39d84c5df216..0794e6278c4b 100644
--- a/cui/uiconfig/ui/certdialog.ui
+++ b/cui/uiconfig/ui/certdialog.ui
@@ -41,7 +41,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
                 <child internal-child="accessible">
diff --git a/cui/uiconfig/ui/tsaurldialog.ui b/cui/uiconfig/ui/tsaurldialog.ui
index 3d005f3faa22..6bcceb4bfeeb 100644
--- a/cui/uiconfig/ui/tsaurldialog.ui
+++ b/cui/uiconfig/ui/tsaurldialog.ui
@@ -51,7 +51,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
@@ -68,7 +67,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
               </object>
diff --git a/dbaccess/uiconfig/ui/collectionviewdialog.ui b/dbaccess/uiconfig/ui/collectionviewdialog.ui
index 0ffb48584773..73302a721fe9 100644
--- a/dbaccess/uiconfig/ui/collectionviewdialog.ui
+++ b/dbaccess/uiconfig/ui/collectionviewdialog.ui
@@ -66,7 +66,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
@@ -135,7 +134,6 @@
                     <property name="can_focus">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="can_default">True</property>
-                    <property name="has_default">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes" context="collectionviewdialog|newFolderButton|tooltip_text">Create New Directory</property>
                     <property name="image">image1</property>
@@ -152,7 +150,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
-                    <property name="has_default">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes" context="collectionviewdialog|upButton|tooltip_text">Up One Level</property>
                     <property name="image">image2</property>
diff --git a/sfx2/uiconfig/ui/versioncommentdialog.ui b/sfx2/uiconfig/ui/versioncommentdialog.ui
index 2c74db6c5ec4..46ca82b19f2f 100644
--- a/sfx2/uiconfig/ui/versioncommentdialog.ui
+++ b/sfx2/uiconfig/ui/versioncommentdialog.ui
@@ -42,7 +42,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
-- 
cgit v1.2.3