[Libreoffice-commits] core.git: bin/gla11y solenv/sanitizers

[Samuel Thibault (via logerrit)]

 bin/gla11y                               |    4 ++--
 solenv/sanitizers/ui/modules/scalc.suppr |    8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 4c483204edc5ab5da4b40eb92fd69c6d87d11505
Author:     Samuel Thibault <samuel.thibault at ens-lyon.org>
AuthorDate: Sat Feb 29 23:07:11 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Mar 1 16:42:14 2020 +0100

    gla11y: Fix checking orphan labels
    
    Change-Id: Icd43014f40a655b512b6328f4800906325d9b164
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89767
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bin/gla11y b/bin/gla11y
index aff0a13172c6..1ae67b173959 100755
--- a/bin/gla11y
+++ b/bin/gla11y
@@ -10,7 +10,7 @@
 # This file incorporates work covered by the following license notice:
 #
 #   Copyright (c) 2018 Martin Pieuchot
-#   Copyright (c) 2018-2019 Samuel Thibault <sthibault at hypra.fr>
+#   Copyright (c) 2018-2020 Samuel Thibault <sthibault at hypra.fr>
 #
 #   Permission to use, copy, modify, and distribute this software for any
 #   purpose with or without fee is hereby granted, provided that the above
@@ -677,7 +677,7 @@ def is_orphan_label(filename, tree, root, obj, orphan_root, doprint = False):
         # This label is part of a button
         return False
 
-    oid = obj.attrib.get('oid')
+    oid = obj.attrib.get('id')
     if oid is not None:
         if oid in labelled_by_elm:
             # Some widget is labelled by us, we are not orphan.
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr
index ebb2152b0ec2..8de4823a7f67 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -117,10 +117,6 @@ sc/uiconfig/scalc/ui/pivotfielddialog.ui://GtkLabel[@id='label2'] orphan-label
 sc/uiconfig/scalc/ui/pivotfielddialog.ui://GtkLabel[@id='name'] orphan-label
 sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='connect1'] missing-label-for
 sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='connect2'] no-labelled-by
-sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkLabel[@id='label2'] orphan-label
-sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkLabel[@id='label3'] orphan-label
-sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkLabel[@id='label4'] orphan-label
-sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkLabel[@id='label5'] orphan-label
 sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='field1'] missing-label-for
 sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='field2'] missing-label-for
 sc/uiconfig/scalc/ui/pivotfilterdialog.ui://GtkComboBoxText[@id='field3'] missing-label-for
@@ -150,10 +146,6 @@ sc/uiconfig/scalc/ui/retypepassdialog.ui://GtkLabel[@id='docStatusLabel'] orphan
 sc/uiconfig/scalc/ui/sorttransformationentry.ui:GtkGrid[@id='grid']/GtkBox/GtkLabel orphan-label
 sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='connect1'] missing-label-for
 sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='connect2'] missing-label-for
-sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkLabel[@id='label2'] orphan-label
-sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkLabel[@id='label3'] orphan-label
-sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkLabel[@id='label4'] orphan-label
-sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkLabel[@id='label5'] orphan-label
 sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='field1'] missing-label-for
 sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='field2'] missing-label-for
 sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkComboBoxText[@id='field3'] missing-label-for