remove some member-of a11y relations

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: Ifecd0eb96afecadbd66fcfdf843ce1590f5c5ff4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131185
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

8 files changed, 44 insertions, 19 deletions

diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui b/sc/uiconfig/scalc/ui/solverdlg.ui
index 5dfedae65415..18bbb5868caa 100644
--- a/sc/uiconfig/scalc/ui/solverdlg.ui
+++ b/sc/uiconfig/scalc/ui/solverdlg.ui
@@ -139,8 +139,15 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="solverdlg|result">Optimize result to</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">max</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
+                    <accessibility>
+                      <relation type="label-for" target="min"/>
+                      <relation type="label-for" target="max"/>
+                      <relation type="label-for" target="value"/>
+                    </accessibility>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -171,7 +178,7 @@
                     <property name="draw-indicator">True</property>
                     <property name="group">max</property>
                     <accessibility>
-                      <relation type="member-of" target="result"/>
+                      <relation type="labelled-by" target="result"/>
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="min-atkobject">
@@ -194,7 +201,7 @@
                     <property name="active">True</property>
                     <property name="draw-indicator">True</property>
                     <accessibility>
-                      <relation type="member-of" target="result"/>
+                      <relation type="labelled-by" target="result"/>
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="max-atkobject">
@@ -310,7 +317,7 @@
                         <property name="draw-indicator">True</property>
                         <property name="group">max</property>
                         <accessibility>
-                          <relation type="member-of" target="result"/>
+                          <relation type="labelled-by" target="result"/>
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="value-atkobject">
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr
index 9024bbf6bc80..445d4c530666 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -135,7 +135,6 @@ sc/uiconfig/scalc/ui/searchresults.ui://GtkLabel[@id='lbSearchResults'] orphan-l
 sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='warning'] orphan-label
 sc/uiconfig/scalc/ui/showchangesdialog.ui://GtkEntry[@id='range'] no-labelled-by
 sc/uiconfig/scalc/ui/solverdlg.ui://GtkLabel[@id='targetlabel'] orphan-label
-sc/uiconfig/scalc/ui/solverdlg.ui://GtkLabel[@id='result'] orphan-label
 sc/uiconfig/scalc/ui/solverdlg.ui://GtkLabel[@id='changelabel'] orphan-label
 sc/uiconfig/scalc/ui/solverdlg.ui://GtkLabel[@id='cellreflabel'] orphan-label
 sc/uiconfig/scalc/ui/solverdlg.ui://GtkLabel[@id='oplabel'] orphan-label
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr
index 5e4d49011f74..c7ae2f09a613 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -44,7 +44,6 @@ sw/uiconfig/swriter/ui/fldvarpage.ui://GtkLabel[@id='label5'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label6'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label7'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label8'] orphan-label
-sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='pos'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='offset'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label11'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label4'] orphan-label
@@ -53,6 +52,7 @@ sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label15'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label16'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label17'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label18'] orphan-label
+sw/uiconfig/swriter/ui/footnotepage.ui://GtkRadioButton[@id='pospagecb'] labelled-by-and-mnemonic
 sw/uiconfig/swriter/ui/frmaddpage.ui://GtkLabel[@id='label2'] orphan-label
 sw/uiconfig/swriter/ui/gotopagedialog.ui://GtkLabel[@id='page_count'] orphan-label
 sw/uiconfig/swriter/ui/hfmenubutton.ui://GtkMenuItem[@id='edit'] button-no-label
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 47e7dbc7ef5d..62512a391ff9 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -33,9 +33,7 @@ svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchdesc'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='entirecells'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='replacedesc'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label7'] orphan-label
-svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchinlabel'] orphan-label
-svx/uiconfig/ui/findreplacedialog.ui://GtkComboBoxText[@id='calcsearchin'] no-labelled-by
-svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchdir'] orphan-label
+svx/uiconfig/ui/findreplacedialog.ui://GtkRadioButton[@id='rows'] labelled-by-and-mnemonic
 svx/uiconfig/ui/floatingcontour.ui://GtkLabel[@id='statuspos'] orphan-label
 svx/uiconfig/ui/floatingcontour.ui://GtkLabel[@id='statussize'] orphan-label
 svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='label4'] orphan-label
@@ -46,7 +44,6 @@ svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='replacedesc'] orphan
 svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='label7'] orphan-label
 svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='searchinlabel'] orphan-label
 svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkComboBoxText[@id='calcsearchin'] no-labelled-by
-svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='searchdir'] orphan-label
 svx/uiconfig/ui/fontworkgallerydialog.ui://GtkLabel[@id='label1'] orphan-label
 svx/uiconfig/ui/grafctrlbox.ui://GtkSpinButton[@id='spinfield'] no-labelled-by
 svx/uiconfig/ui/headfootformatpage.ui://GtkLabel[@id='labelHeaderFormat'] orphan-label
diff --git a/svx/uiconfig/ui/findreplacedialog-mobile.ui b/svx/uiconfig/ui/findreplacedialog-mobile.ui
index a7866db2d14b..3e025317fba2 100644
--- a/svx/uiconfig/ui/findreplacedialog-mobile.ui
+++ b/svx/uiconfig/ui/findreplacedialog-mobile.ui
@@ -992,6 +992,10 @@
                                     <property name="label" translatable="yes" context="findreplacedialog-mobile|searchdir">Direction:</property>
                                     <property name="use_underline">True</property>
                                     <property name="xalign">0</property>
+                                    <accessibility>
+                                      <relation type="label-for" target="rows"/>
+                                      <relation type="label-for" target="cols"/>
+                                    </accessibility>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1014,7 +1018,7 @@
                                         <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
                                         <accessibility>
-                                          <relation type="member-of" target="searchdir"/>
+                                          <relation type="labelled-by" target="searchdir"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -1033,7 +1037,7 @@
                                         <property name="draw_indicator">True</property>
                                         <property name="group">rows</property>
                                         <accessibility>
-                                          <relation type="member-of" target="searchdir"/>
+                                          <relation type="labelled-by" target="searchdir"/>
                                         </accessibility>
                                       </object>
                                       <packing>
diff --git a/svx/uiconfig/ui/findreplacedialog.ui b/svx/uiconfig/ui/findreplacedialog.ui
index 23404d3663a2..4c1e9d2bc45f 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -1053,6 +1053,7 @@
                                     <property name="no-show-all">True</property>
                                     <property name="label" translatable="yes" context="findreplacedialog|searchinlabel">Search i_n:</property>
                                     <property name="use-underline">True</property>
+                                    <property name="mnemonic-widget">calcsearchin</property>
                                     <property name="xalign">0</property>
                                   </object>
                                   <packing>
@@ -1095,7 +1096,12 @@
                                     <property name="no-show-all">True</property>
                                     <property name="label" translatable="yes" context="findreplacedialog|searchdir">Direction:</property>
                                     <property name="use-underline">True</property>
+                                    <property name="mnemonic-widget">rows</property>
                                     <property name="xalign">0</property>
+                                    <accessibility>
+                                      <relation type="label-for" target="rows"/>
+                                      <relation type="label-for" target="cols"/>
+                                    </accessibility>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1118,7 +1124,7 @@
                                         <property name="active">True</property>
                                         <property name="draw-indicator">True</property>
                                         <accessibility>
-                                          <relation type="member-of" target="searchdir"/>
+                                          <relation type="labelled-by" target="searchdir"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -1137,7 +1143,7 @@
                                         <property name="draw-indicator">True</property>
                                         <property name="group">rows</property>
                                         <accessibility>
-                                          <relation type="member-of" target="searchdir"/>
+                                          <relation type="labelled-by" target="searchdir"/>
                                         </accessibility>
                                       </object>
                                       <packing>
diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui
index dbadd2728e3e..2f6a725443be 100644
--- a/sw/uiconfig/swriter/ui/footnotepage.ui
+++ b/sw/uiconfig/swriter/ui/footnotepage.ui
@@ -72,7 +72,13 @@
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="footnotepage|pos">Position</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">pospagecb</property>
                 <property name="xalign">0</property>
+                <accessibility>
+                  <relation type="label-for" target="pospagecb"/>
+                  <relation type="label-for" target="posdoccb"/>
+                </accessibility>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -113,7 +119,7 @@
                 <property name="active">True</property>
                 <property name="draw-indicator">True</property>
                 <accessibility>
-                  <relation type="member-of" target="pos"/>
+                  <relation type="labelled-by" target="pos"/>
                 </accessibility>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="pospagecb-atkobject">
@@ -136,7 +142,7 @@
                 <property name="draw-indicator">True</property>
                 <property name="group">pospagecb</property>
                 <accessibility>
-                  <relation type="member-of" target="pos"/>
+                  <relation type="labelled-by" target="pos"/>
                 </accessibility>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="posdoccb-atkobject">
diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
index c3ebc1d123d2..5b251afdcae7 100644
--- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui
+++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
@@ -54,6 +54,12 @@
                     <property name="receives-default">False</property>
                     <property name="use-underline">True</property>
                     <property name="draw-indicator">True</property>
+                    <accessibility>
+                      <relation type="label-for" target="page"/>
+                      <relation type="label-for" target="column"/>
+                      <relation type="label-for" target="before"/>
+                      <relation type="label-for" target="after"/>
+                    </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="break-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|break">Select this check box, and then select the type of break that you want to associate with the table.</property>
@@ -75,7 +81,7 @@
                     <property name="active">True</property>
                     <property name="draw-indicator">True</property>
                     <accessibility>
-                      <relation type="member-of" target="break"/>
+                      <relation type="labelled-by" target="break"/>
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="page-atkobject">
@@ -98,7 +104,7 @@
                     <property name="draw-indicator">True</property>
                     <property name="group">page</property>
                     <accessibility>
-                      <relation type="member-of" target="break"/>
+                      <relation type="labelled-by" target="break"/>
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="column-atkobject">
@@ -121,7 +127,7 @@
                     <property name="active">True</property>
                     <property name="draw-indicator">True</property>
                     <accessibility>
-                      <relation type="member-of" target="break"/>
+                      <relation type="labelled-by" target="break"/>
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="before-atkobject">
@@ -144,7 +150,7 @@
                     <property name="draw-indicator">True</property>
                     <property name="group">before</property>
                     <accessibility>
-                      <relation type="member-of" target="break"/>
+                      <relation type="labelled-by" target="break"/>
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="after-atkobject">