Revert "fix some accessibility warnings"

This reverts commit 885ae69174cf717edd00526e5cf8f1585c505c95.

<caolan> noel_grandin, wrt the accessibility labelled-by and label-for. If the label really is a GtkLabel then setting its mnemonic target (in glade, general tab, and use underline and select a target) is the most straight forward thing to do and implies those a11y relations
<caolan> the painful manual a11y labelled-by/label-for are typically for using something weird, like a checkbutton, as a label for something

Change-Id: I13db8ec65d10248aa46cb6b01398ec302dd06b59
Reviewed-on: https://gerrit.libreoffice.org/76837
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 6 insertions, 75 deletions

diff --git a/cui/uiconfig/ui/assigncomponentdialog.ui b/cui/uiconfig/ui/assigncomponentdialog.ui
index 4c77b44f330c..9fbfcb538a6a 100644
--- a/cui/uiconfig/ui/assigncomponentdialog.ui
+++ b/cui/uiconfig/ui/assigncomponentdialog.ui
@@ -93,9 +93,6 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes" context="assigncomponentdialog|label1">Component method name:</property>
-                <accessibility>
-                  <relation type="label-for" target="methodEntry"/>
-                </accessibility>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -109,9 +106,6 @@
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="activates_default">True</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label1"/>
-                </accessibility>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
index 485957da7b4b..3336f28a835f 100644
--- a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
+++ b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkListStore" id="os-liststore">
@@ -31,11 +31,8 @@
   <object class="GtkDialog" id="BlackOrWhiteListEntryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title">dummy</property>
+    <property name="title" translatable="no">dummy</property>
     <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
@@ -129,9 +126,6 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="model">os-liststore</property>
-                            <accessibility>
-                              <relation type="labelled-by" target="label4"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -144,9 +138,6 @@
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
                             <property name="width_chars">22</property>
-                            <accessibility>
-                              <relation type="labelled-by" target="label5"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -159,9 +150,6 @@
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
                             <property name="width_chars">12</property>
-                            <accessibility>
-                              <relation type="labelled-by" target="label6"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -174,9 +162,6 @@
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
                             <property name="width_chars">22</property>
-                            <accessibility>
-                              <relation type="labelled-by" target="label7"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -189,9 +174,6 @@
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
                             <property name="width_chars">22</property>
-                            <accessibility>
-                              <relation type="labelled-by" target="label8"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -205,9 +187,6 @@
                             <property name="halign">end</property>
                             <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label4">Operating system:</property>
                             <property name="use_underline">True</property>
-                            <accessibility>
-                              <relation type="label-for" target="os"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -221,9 +200,6 @@
                             <property name="halign">end</property>
                             <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label5">Version:</property>
                             <property name="use_underline">True</property>
-                            <accessibility>
-                              <relation type="label-for" target="osversion"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -237,9 +213,6 @@
                             <property name="halign">end</property>
                             <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label6">OpenCL vendor:</property>
                             <property name="use_underline">True</property>
-                            <accessibility>
-                              <relation type="label-for" target="platformvendor"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -253,9 +226,6 @@
                             <property name="halign">end</property>
                             <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label7">Device:</property>
                             <property name="use_underline">True</property>
-                            <accessibility>
-                              <relation type="label-for" target="device"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -269,9 +239,6 @@
                             <property name="halign">end</property>
                             <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label8">Driver version:</property>
                             <property name="use_underline">True</property>
-                            <accessibility>
-                              <relation type="label-for" target="driverversion"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
diff --git a/cui/uiconfig/ui/breaknumberoption.ui b/cui/uiconfig/ui/breaknumberoption.ui
index c2cae417ec2f..0f60f687762d 100644
--- a/cui/uiconfig/ui/breaknumberoption.ui
+++ b/cui/uiconfig/ui/breaknumberoption.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.20.4 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -17,9 +17,6 @@
     <property name="default_width">0</property>
     <property name="default_height">0</property>
     <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
@@ -91,9 +88,6 @@
                         <property name="halign">start</property>
                         <property name="activates_default">True</property>
                         <property name="adjustment">adjustment1</property>
-                        <accessibility>
-                          <relation type="labelled-by" target="beforelabel"/>
-                        </accessibility>
                       </object>
                     </child>
                   </object>
@@ -106,9 +100,6 @@
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
-                    <accessibility>
-                      <relation type="label-for" target="beforebreak"/>
-                    </accessibility>
                   </object>
                 </child>
               </object>
@@ -136,9 +127,6 @@
                         <property name="halign">start</property>
                         <property name="activates_default">True</property>
                         <property name="adjustment">adjustment1</property>
-                        <accessibility>
-                          <relation type="labelled-by" target="afterlabel"/>
-                        </accessibility>
                       </object>
                     </child>
                   </object>
@@ -151,9 +139,6 @@
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
-                    <accessibility>
-                      <relation type="label-for" target="afterbreak"/>
-                    </accessibility>
                   </object>
                 </child>
               </object>
@@ -181,9 +166,6 @@
                         <property name="halign">start</property>
                         <property name="activates_default">True</property>
                         <property name="adjustment">adjustment1</property>
-                        <accessibility>
-                          <relation type="labelled-by" target="minimallabel"/>
-                        </accessibility>
                       </object>
                     </child>
                   </object>
@@ -196,9 +178,6 @@
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
-                    <accessibility>
-                      <relation type="label-for" target="wordlength"/>
-                    </accessibility>
                   </object>
                 </child>
               </object>
@@ -220,5 +199,8 @@
       <action-widget response="-5">ok</action-widget>
       <action-widget response="-6">cancel</action-widget>
     </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/cui/uiconfig/ui/storedwebconnectiondialog.ui b/cui/uiconfig/ui/storedwebconnectiondialog.ui
index e61d6ac0aa43..69f2c30b9b79 100644
--- a/cui/uiconfig/ui/storedwebconnectiondialog.ui
+++ b/cui/uiconfig/ui/storedwebconnectiondialog.ui
@@ -80,9 +80,6 @@
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="storedwebconnectiondialog|label1">Web login information (passwords are never shown)</property>
                 <property name="xalign">0</property>
-                <accessibility>
-                  <relation type="label-for" target="logins"/>
-                </accessibility>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -136,9 +133,6 @@
                         </child>
                       </object>
                     </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="label1"/>
-                    </accessibility>
                   </object>
                 </child>
               </object>
diff --git a/cui/uiconfig/ui/tsaurldialog.ui b/cui/uiconfig/ui/tsaurldialog.ui
index 67d247c0037b..3d005f3faa22 100644
--- a/cui/uiconfig/ui/tsaurldialog.ui
+++ b/cui/uiconfig/ui/tsaurldialog.ui
@@ -148,9 +148,6 @@
                         <property name="max_width_chars">60</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <accessibility>
-                          <relation type="label-for" target="urls"/>
-                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -189,9 +186,6 @@
                                 </child>
                               </object>
                             </child>
-                            <accessibility>
-                              <relation type="labelled-by" target="label2"/>
-                            </accessibility>
                           </object>
                         </child>
                       </object>