[Libreoffice-commits] core.git: cui/uiconfig solenv/sanitizers

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Fri Aug 2 10:28:14 UTC 2019


 cui/uiconfig/ui/assigncomponentdialog.ui       |    6 ----
 cui/uiconfig/ui/blackorwhitelistentrydialog.ui |   37 +------------------------
 cui/uiconfig/ui/breaknumberoption.ui           |   26 ++---------------
 cui/uiconfig/ui/storedwebconnectiondialog.ui   |    6 ----
 cui/uiconfig/ui/tsaurldialog.ui                |    6 ----
 solenv/sanitizers/ui/cui.suppr                 |   17 +++++++++++
 6 files changed, 23 insertions(+), 75 deletions(-)

New commits:
commit 493a1bfbc07394a94b6b8f0b35946b9e17c96001
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Aug 2 10:24:32 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Aug 2 12:27:19 2019 +0200

    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 at collabora.co.uk>

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>
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index db4378b943c3..c40300cd77b3 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -12,6 +12,8 @@ cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='singlestartex'] orphan-lab
 cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='singleendex'] orphan-label
 cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='doublestartex'] orphan-label
 cui/uiconfig/ui/applylocalizedpage.ui://GtkLabel[@id='doubleendex'] orphan-label
+cui/uiconfig/ui/assigncomponentdialog.ui://GtkLabel[@id='label1'] orphan-label
+cui/uiconfig/ui/assigncomponentdialog.ui://GtkEntry[@id='methodEntry'] no-labelled-by
 cui/uiconfig/ui/backgroundpage.ui://GtkLabel[@id='fileft'] orphan-label
 cui/uiconfig/ui/backgroundpage.ui://GtkLabel[@id='unlinkedft'] orphan-label
 cui/uiconfig/ui/backgroundpage.ui://GtkLabel[@id='findgraphicsft'] orphan-label
@@ -24,10 +26,23 @@ cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='FULL_TYPE_NAME'] orphan-label
 cui/uiconfig/ui/bitmaptabpage.ui://GtkLabel[@id='label4'] orphan-label
 cui/uiconfig/ui/bitmaptabpage.ui://GtkLabel[@id='label9'] orphan-label
 cui/uiconfig/ui/bitmaptabpage.ui://GtkSpinButton[@id='tileoffmtr'] no-labelled-by
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkComboBox[@id='os'] no-labelled-by
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkEntry[@id='osversion'] no-labelled-by
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkEntry[@id='platformvendor'] no-labelled-by
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkEntry[@id='device'] no-labelled-by
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkEntry[@id='driverversion'] no-labelled-by
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='label4'] orphan-label
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='label5'] orphan-label
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='label6'] orphan-label
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='label7'] orphan-label
+cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='label8'] orphan-label
 cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='bledittitle'] orphan-label
 cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='bladdtitle'] orphan-label
 cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='wledittitle'] orphan-label
 cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='wladdtitle'] orphan-label
+cui/uiconfig/ui/breaknumberoption.ui://GtkSpinButton[@id='beforebreak'] no-labelled-by
+cui/uiconfig/ui/breaknumberoption.ui://GtkSpinButton[@id='afterbreak'] no-labelled-by
+cui/uiconfig/ui/breaknumberoption.ui://GtkSpinButton[@id='wordlength'] no-labelled-by
 cui/uiconfig/ui/cellalignment.ui://GtkLabel[@id='labelSTR_BOTTOMLOCK'] orphan-label
 cui/uiconfig/ui/cellalignment.ui://GtkLabel[@id='labelSTR_TOPLOCK'] orphan-label
 cui/uiconfig/ui/cellalignment.ui://GtkLabel[@id='labelSTR_CELLLOCK'] orphan-label
@@ -356,6 +371,7 @@ cui/uiconfig/ui/spellingdialog.ui://GtkLabel[@id='explain'] orphan-label
 cui/uiconfig/ui/spellingdialog.ui://GtkLabel[@id='resumeft'] orphan-label
 cui/uiconfig/ui/spellingdialog.ui://GtkLabel[@id='nosuggestionsft'] orphan-label
 cui/uiconfig/ui/spellingdialog.ui://GtkLabel[@id='alttitleft'] orphan-label
+cui/uiconfig/ui/storedwebconnectiondialog.ui://GtkLabel[@id='label1'] orphan-label
 cui/uiconfig/ui/textanimtabpage.ui://GtkLabel[@id='FT_COUNT'] orphan-label
 cui/uiconfig/ui/textanimtabpage.ui://GtkLabel[@id='FT_AMOUNT'] orphan-label
 cui/uiconfig/ui/textanimtabpage.ui://GtkLabel[@id='FT_DELAY'] orphan-label
@@ -363,6 +379,7 @@ cui/uiconfig/ui/textflowpage.ui://GtkLabel[@id='labelOrphan'] orphan-label
 cui/uiconfig/ui/textflowpage.ui://GtkLabel[@id='labelWidow'] orphan-label
 cui/uiconfig/ui/thesaurus.ui://GtkButton[@id='left'] button-no-label
 cui/uiconfig/ui/thesaurus.ui://GtkLabel[@id='notfound'] orphan-label
+cui/uiconfig/ui/tsaurldialog.ui://GtkLabel[@id='label2'] orphan-label
 cui/uiconfig/ui/tsaurldialog.ui://GtkLabel[@id='enteraurl'] orphan-label
 cui/uiconfig/ui/twolinespage.ui://GtkLabel[@id='label29'] orphan-label
 cui/uiconfig/ui/twolinespage.ui://GtkLabel[@id='label30'] orphan-label


More information about the Libreoffice-commits mailing list