From 3455ef6eff0edb15b59d4e8818a1ce8f54b4454b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 7 Mar 2022 21:04:24 +0000
Subject: remove some member-of a11y relations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In some cases the widgets are in frames now so that hierarchical
relationship is captured already. In others labelled-by is a better
match and/or is already labelled by the widget.

Change-Id: I65cbeab514a443edd96c6f9353f892317ac5f775
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131155
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 cui/uiconfig/ui/pageformatpage.ui             | 8 ++++++--
 cui/uiconfig/ui/zoomdialog.ui                 | 2 --
 solenv/sanitizers/ui/cui.suppr                | 1 +
 sw/uiconfig/swriter/ui/columnpage.ui          | 3 ---
 sw/uiconfig/swriter/ui/indexentry.ui          | 3 ---
 sw/uiconfig/swriter/ui/outlinepositionpage.ui | 3 ---
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/cui/uiconfig/ui/pageformatpage.ui b/cui/uiconfig/ui/pageformatpage.ui
index 502941922cb7..e96e063f42ba 100644
--- a/cui/uiconfig/ui/pageformatpage.ui
+++ b/cui/uiconfig/ui/pageformatpage.ui
@@ -120,6 +120,10 @@
                     <property name="use-underline">True</property>
                     <property name="mnemonic-widget">radiobuttonPortrait</property>
                     <property name="xalign">0</property>
+                    <accessibility>
+                      <relation type="label-for" target="radiobuttonPortrait"/>
+                      <relation type="label-for" target="radiobuttonLandscape"/>
+                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -137,7 +141,7 @@
                     <property name="active">True</property>
                     <property name="draw-indicator">True</property>
                     <accessibility>
-                      <relation type="member-of" target="labelOrientation"/>
+                      <relation type="labelled-by" target="labelOrientation"/>
                     </accessibility>
                   </object>
                   <packing>
@@ -157,7 +161,7 @@
                     <property name="draw-indicator">True</property>
                     <property name="group">radiobuttonPortrait</property>
                     <accessibility>
-                      <relation type="member-of" target="labelOrientation"/>
+                      <relation type="labelled-by" target="labelOrientation"/>
                     </accessibility>
                   </object>
                   <packing>
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index 6477ef01db49..b9ca90236145 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.ui
@@ -359,7 +359,6 @@
                             <property name="adjustment">adjustment1</property>
                             <accessibility>
                               <relation type="labelled-by" target="columns"/>
-                              <relation type="member-of" target="columns"/>
                             </accessibility>
                             <property name="truncate-multiline">True</property>
                             <child internal-child="accessible">
@@ -393,7 +392,6 @@
                         <property name="margin-start">12</property>
                         <accessibility>
                           <relation type="labelled-by" target="columns"/>
-                          <relation type="member-of" target="columns"/>
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="bookmode-atkobject">
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index 9a8a1e988fa6..7086f62b9ab5 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -135,6 +135,7 @@ cui/uiconfig/ui/optsecuritypage.ui://GtkLabel[@id='nopasswordsave'] orphan-label
 cui/uiconfig/ui/optsecuritypage.ui://GtkLabel[@id='label4'] orphan-label
 cui/uiconfig/ui/optviewpage.ui://GtkLabel[@id='skiaenabled'] orphan-label
 cui/uiconfig/ui/optviewpage.ui://GtkLabel[@id='skiadisabled'] orphan-label
+cui/uiconfig/ui/pageformatpage.ui://GtkRadioButton[@id='radiobuttonPortrait'] labelled-by-and-mnemonic
 cui/uiconfig/ui/pageformatpage.ui://GtkSpinButton[@id='spinMargLeft'] duplicate-mnemonic
 cui/uiconfig/ui/pageformatpage.ui://GtkSpinButton[@id='spinMargRight'] duplicate-mnemonic
 cui/uiconfig/ui/pageformatpage.ui://GtkLabel[@id='labelMsg'] orphan-label
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui
index c3e2130b9f67..d59446e80f0a 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -411,9 +411,6 @@
             </attributes>
           </object>
         </child>
-        <accessibility>
-          <relation type="member-of" target="label4"/>
-        </accessibility>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui
index cadb430f1754..1b4960e33aeb 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -196,9 +196,6 @@
                         <property name="tooltip_text" translatable="yes" context="indexentry|new|tooltip_text">New User-defined Index</property>
                         <property name="image">image1</property>
                         <property name="always-show-image">True</property>
-                        <accessibility>
-                          <relation type="member-of" target="label1"/>
-                        </accessibility>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
index 649227aa0034..528c51823745 100644
--- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
@@ -461,9 +461,6 @@ numbering and text:</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="halign">end</property>
-                <accessibility>
-                  <relation type="member-of" target="label10"/>
-                </accessibility>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="standard-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|standard">Resets the indent and the spacing values to the default values.</property>
-- 
cgit