cui/uiconfig/ui/borderpage.ui | 5 ----- cui/uiconfig/ui/colorpage.ui | 5 ----- cui/uiconfig/ui/twolinespage.ui | 10 ---------- sw/uiconfig/swriter/ui/watermarkdialog.ui | 5 ----- vcl/source/control/fixed.cxx | 10 ---------- vcl/source/window/window.cxx | 12 +----------- 6 files changed, 1 insertion(+), 46 deletions(-)
New commits: commit 73816234e265f4ae61a8f2b6318a207c39a02726 Author: Parth Raiyani <[email protected]> AuthorDate: Thu Feb 5 13:26:31 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 00:00:15 2026 +0100 a11y: remove redundant accessible role definitions from UI files Signed-off-by: Parth Raiyani <[email protected]> Change-Id: I0cdf229746b9956c1d67cec223e92d4ed4586a54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198748 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200516 diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui index 319239502e9a..397dde7cea57 100644 --- a/cui/uiconfig/ui/borderpage.ui +++ b/cui/uiconfig/ui/borderpage.ui @@ -113,11 +113,6 @@ <property name="use-underline">True</property> <property name="mnemonic-widget">framesel</property> <property name="xalign">0</property> - <child internal-child="accessible"> - <object class="AtkObject" id="userdefft-atkobject"> - <property name="AtkObject::accessible-role">static</property> - </object> - </child> </object> <packing> <property name="left-attach">0</property> diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index 61ddf6fd5422..c942030f886a 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -157,11 +157,6 @@ <property name="use-underline">True</property> <property name="mnemonic-widget">iconview_recent_colors</property> <property name="xalign">0</property> - <child internal-child="accessible"> - <object class="AtkObject" id="recentcolorlb-atkobject"> - <property name="AtkObject::accessible-role">static</property> - </object> - </child> </object> <packing> <property name="expand">False</property> diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui index 8ffd95ebbede..039e2c6f873d 100644 --- a/cui/uiconfig/ui/twolinespage.ui +++ b/cui/uiconfig/ui/twolinespage.ui @@ -86,11 +86,6 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="twolinespage|label29">Initial character</property> <property name="mnemonic-widget">startbracket</property> - <child internal-child="accessible"> - <object class="AtkObject" id="label29-atkobject"> - <property name="AtkObject::accessible-role">static</property> - </object> - </child> </object> <packing> <property name="left_attach">0</property> @@ -103,11 +98,6 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="twolinespage|label30">Final character</property> <property name="mnemonic-widget">endbracket</property> - <child internal-child="accessible"> - <object class="AtkObject" id="label30-atkobject"> - <property name="AtkObject::accessible-role">static</property> - </object> - </child> </object> <packing> <property name="left_attach">1</property> diff --git a/sw/uiconfig/swriter/ui/watermarkdialog.ui b/sw/uiconfig/swriter/ui/watermarkdialog.ui index 1abd1af73e68..904d8cde3dc0 100644 --- a/sw/uiconfig/swriter/ui/watermarkdialog.ui +++ b/sw/uiconfig/swriter/ui/watermarkdialog.ui @@ -172,11 +172,6 @@ <property name="label" translatable="yes" context="watermarkdialog|ColorLabel">Color</property> <property name="use-underline">True</property> <property name="mnemonic-widget">Color</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ColorLabel-atkobject"> - <property name="AtkObject::accessible-role">static</property> - </object> - </child> </object> <packing> <property name="left-attach">0</property> commit 645ad7c0ce83e6bd085d1f1f28ec4ac2aba1f758 Author: Parth Raiyani <[email protected]> AuthorDate: Thu Feb 5 13:25:57 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 00:00:07 2026 +0100 FixedText: remove renderAsStatic flag logic - no need to stamp renderAsStatic flag in json as changed LOK to create <span> as default and only create <label> when label-for attribute is present in json Signed-off-by: Parth Raiyani <[email protected]> Change-Id: I069957bd58068d6709ec9128bda3ef45ac4f3b45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198747 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200515 diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 9a7e985a81d0..4ad14295a031 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -462,16 +462,6 @@ void SelectableFixedText::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) Edit::DumpAsPropertyTree(rJsonWriter); rJsonWriter.put("type", "fixedtext"); rJsonWriter.put("selectable", true); - - // Add renderAsStatic for accessibility - sal_uInt16 nAccessibleRole = GetAccessibleRole(); - const std::initializer_list<sal_uInt16> staticRoles = { - css::accessibility::AccessibleRole::STATIC, - css::accessibility::AccessibleRole::NOTIFICATION - }; - - if (std::find(staticRoles.begin(), staticRoles.end(), nAccessibleRole) != staticRoles.end()) - rJsonWriter.put("renderAsStatic", true); } void FixedLine::ImplInit( vcl::Window* pParent, WinBits nStyle ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 217d055a7a3f..ae4e52cd7082 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3410,19 +3410,9 @@ void Window::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) } } - // If GtkLabel has a static accessibility role, mark renderAsStatic. - // so LOK renders it as <span> instead of <label> for correct accessibility. OUString sAccRole; sal_uInt16 nAccessibleRole = GetAccessibleRole(); - const std::initializer_list<sal_uInt16> staticRoles = { - css::accessibility::AccessibleRole::STATIC, - css::accessibility::AccessibleRole::NOTIFICATION - }; - - if (std::find(staticRoles.begin(), staticRoles.end(), nAccessibleRole) != staticRoles.end() - && GetType() == WindowType::FIXEDTEXT) - rJsonWriter.put("renderAsStatic", true); - else if (nAccessibleRole == css::accessibility::AccessibleRole::PAGE_TAB_LIST) + if (nAccessibleRole == css::accessibility::AccessibleRole::PAGE_TAB_LIST) sAccRole = "tablist"; vcl::Window* pAccLabelFor = getAccessibleRelationLabelFor();
