cui/source/dialogs/passwdomdlg.cxx | 4 +-- cui/uiconfig/ui/borderpage.ui | 8 +++---- cui/uiconfig/ui/croppage.ui | 32 +++++++++++++++--------------- cui/uiconfig/ui/hyperlinkdocpage.ui | 4 +-- cui/uiconfig/ui/password.ui | 8 +++---- cui/uiconfig/ui/rotationtabpage.ui | 6 ++--- cui/uiconfig/ui/similaritysearchdialog.ui | 4 +-- cui/uiconfig/ui/widgettestdialog.ui | 5 ++++ sw/uiconfig/swriter/ui/picturepage.ui | 4 +-- 9 files changed, 40 insertions(+), 35 deletions(-)
New commits: commit 444954bc47b7c412d6cf14432492fc84eccec2e0 Author: Parth Raiyani <[email protected]> AuthorDate: Tue Feb 10 13:19:24 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 00:41:41 2026 +0100 a11y: fix conflicting label ids issue in LOk in various dialog UI Change-Id: I75ff73184994a35889896f19bc4618aaf543780c Signed-off-by: Parth Raiyani <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198991 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/+/200524 diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index dd67c4e7c565..3630f3e7d7d8 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -150,11 +150,11 @@ PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, s , m_xOptionsExpander(m_xBuilder->weld_expander(u"expander"_ustr)) , m_xOk(m_xBuilder->weld_button(u"ok"_ustr)) , m_xOpenReadonlyCB(m_xBuilder->weld_check_button(u"readonly"_ustr)) - , m_xPasswdToModifyFT(m_xBuilder->weld_label(u"label7"_ustr)) + , m_xPasswdToModifyFT(m_xBuilder->weld_label(u"passwordlabel7"_ustr)) , m_xPasswdToModifyED(m_xBuilder->weld_entry(u"newpassroEntry"_ustr)) , m_xPasswdToModifyInd(m_xBuilder->weld_label(u"newpassroIndicator"_ustr)) , m_xPasswdToModifyBar(m_xBuilder->weld_level_bar(u"ropasslevelbar"_ustr)) - , m_xReenterPasswdToModifyFT(m_xBuilder->weld_label(u"label8"_ustr)) + , m_xReenterPasswdToModifyFT(m_xBuilder->weld_label(u"passwordlabel8"_ustr)) , m_xReenterPasswdToModifyED(m_xBuilder->weld_entry(u"confirmropassEntry"_ustr)) , m_xReenterPasswdToModifyInd(m_xBuilder->weld_label(u"confirmropassIndicator"_ustr)) , m_aOneMismatch( CuiResId( RID_CUISTR_ONE_PASSWORD_MISMATCH ) ) diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui index 397dde7cea57..23e4dd369bfe 100644 --- a/cui/uiconfig/ui/borderpage.ui +++ b/cui/uiconfig/ui/borderpage.ui @@ -280,7 +280,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label16"> + <object class="GtkLabel" id="borderlabel16"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="borderpage|label16">_Thickness:</property> @@ -315,7 +315,7 @@ <item id="6" translatable="yes" context="borderpage|linewidthlb">Custom</item> </items> <accessibility> - <relation type="labelled-by" target="label16"/> + <relation type="labelled-by" target="borderlabel16"/> </accessibility> </object> <packing> @@ -335,7 +335,7 @@ <property name="digits">2</property> <property name="value">0.05</property> <accessibility> - <relation type="labelled-by" target="label16"/> + <relation type="labelled-by" target="borderlabel16"/> </accessibility> </object> <packing> @@ -726,7 +726,7 @@ <widgets> <widget name="label14"/> <widget name="label15"/> - <widget name="label16"/> + <widget name="borderlabel16"/> <widget name="label17"/> </widgets> </object> diff --git a/cui/uiconfig/ui/croppage.ui b/cui/uiconfig/ui/croppage.ui index 9f637cf7833c..109ed587fe77 100644 --- a/cui/uiconfig/ui/croppage.ui +++ b/cui/uiconfig/ui/croppage.ui @@ -115,7 +115,7 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="croplabel2"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="croppage|label2">_Left:</property> @@ -143,7 +143,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkLabel" id="croplabel3"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="croppage|label3">_Right:</property> @@ -199,7 +199,7 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="croplabel4"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="croppage|label4">_Top:</property> @@ -213,7 +213,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel" id="croplabel5"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="croppage|label5">_Bottom:</property> @@ -432,7 +432,7 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkLabel" id="croplabel6"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="croppage|label6">_Width:</property> @@ -459,7 +459,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label7"> + <object class="GtkLabel" id="croplabel7"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="croppage|label7">_Height:</property> @@ -534,7 +534,7 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="label8"> + <object class="GtkLabel" id="croplabel8"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="croppage|label8">_Width:</property> @@ -562,7 +562,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label9"> + <object class="GtkLabel" id="croplabel9"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="croppage|label9">_Height:</property> @@ -640,14 +640,14 @@ </object> <object class="GtkSizeGroup" id="sizegroup1"> <widgets> - <widget name="label2"/> - <widget name="label3"/> - <widget name="label4"/> - <widget name="label5"/> - <widget name="label6"/> - <widget name="label7"/> - <widget name="label8"/> - <widget name="label9"/> + <widget name="croplabel2"/> + <widget name="croplabel3"/> + <widget name="croplabel4"/> + <widget name="croplabel5"/> + <widget name="croplabel6"/> + <widget name="croplabel7"/> + <widget name="croplabel8"/> + <widget name="croplabel9"/> </widgets> </object> <object class="GtkSizeGroup" id="sizegroup2"> diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui b/cui/uiconfig/ui/hyperlinkdocpage.ui index 3732eca134a2..28c5ec0209f3 100644 --- a/cui/uiconfig/ui/hyperlinkdocpage.ui +++ b/cui/uiconfig/ui/hyperlinkdocpage.ui @@ -130,7 +130,7 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="target_label"> + <object class="GtkLabel" id="hyperlink_target_label"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> @@ -431,7 +431,7 @@ <object class="GtkSizeGroup" id="sizegroup1"> <widgets> <widget name="path_label"/> - <widget name="target_label"/> + <widget name="hyperlink_target_label"/> <widget name="url_label"/> </widgets> </object> diff --git a/cui/uiconfig/ui/password.ui b/cui/uiconfig/ui/password.ui index d38ebc89197b..07b59576c969 100644 --- a/cui/uiconfig/ui/password.ui +++ b/cui/uiconfig/ui/password.ui @@ -157,7 +157,7 @@ <property name="can-focus">False</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="label7"> + <object class="GtkLabel" id="passwordlabel7"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|label7">Enter password to allow editing</property> @@ -202,7 +202,7 @@ <property name="can-focus">False</property> <property name="column-spacing">6</property> <child> - <object class="GtkLabel" id="label8"> + <object class="GtkLabel" id="passwordlabel8"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|label8">Confirm password</property> @@ -397,7 +397,7 @@ <property name="can-focus">False</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="passwordlabel4"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|label4">_Enter password to open</property> @@ -442,7 +442,7 @@ <property name="can-focus">False</property> <property name="column-spacing">6</property> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel" id="passwordlabel5"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="password|label5">Confirm password</property> diff --git a/cui/uiconfig/ui/rotationtabpage.ui b/cui/uiconfig/ui/rotationtabpage.ui index 1e27b7efddc5..1e5bda3d6a04 100644 --- a/cui/uiconfig/ui/rotationtabpage.ui +++ b/cui/uiconfig/ui/rotationtabpage.ui @@ -248,7 +248,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <child> - <object class="GtkLabel" id="FT_ANGLE"> + <object class="GtkLabel" id="ROT_FT_ANGLE"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="rotationtabpage|FT_ANGLE">_Angle:</property> @@ -273,7 +273,7 @@ <property name="digits">2</property> <property name="wrap">True</property> <accessibility> - <relation type="labelled-by" target="FT_ANGLE"/> + <relation type="labelled-by" target="ROT_FT_ANGLE"/> </accessibility> <child internal-child="accessible"> <object class="AtkObject" id="NF_ANGLE-atkobject"> @@ -402,7 +402,7 @@ <widgets> <widget name="FT_POS_X"/> <widget name="FT_POS_Y"/> - <widget name="FT_ANGLE"/> + <widget name="ROT_FT_ANGLE"/> </widgets> </object> <object class="GtkSizeGroup" id="sizegroup2"> diff --git a/cui/uiconfig/ui/similaritysearchdialog.ui b/cui/uiconfig/ui/similaritysearchdialog.ui index 2bb438357aad..5176f4cd92d9 100644 --- a/cui/uiconfig/ui/similaritysearchdialog.ui +++ b/cui/uiconfig/ui/similaritysearchdialog.ui @@ -103,7 +103,7 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="simsearchlabel2"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="similaritysearchdialog|label2">_Exchange characters:</property> @@ -165,7 +165,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="simsearchlabel4"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="similaritysearchdialog|label4">_Remove characters:</property> diff --git a/sw/uiconfig/swriter/ui/picturepage.ui b/sw/uiconfig/swriter/ui/picturepage.ui index a37c762eb22e..81df1980bc0f 100644 --- a/sw/uiconfig/swriter/ui/picturepage.ui +++ b/sw/uiconfig/swriter/ui/picturepage.ui @@ -66,7 +66,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="picturelabel1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" context="picturepage|label1">_File name</property> @@ -478,7 +478,7 @@ <widget name="allpages"/> <widget name="leftpages"/> <widget name="rightpages"/> - <widget name="label1"/> + <widget name="picturelabel1"/> <widget name="FT_ANGLE"/> </widgets> </object> commit 0c7f1a4eb75de0dbf87c65b7fbcb5780bee5c894 Author: Parth Raiyani <[email protected]> AuthorDate: Sat Feb 7 13:53:38 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 00:41:32 2026 +0100 a11y: add accessible name to combo box in widget test dialog Signed-off-by: Parth Raiyani <[email protected]> Change-Id: I13980761b47634cc7ba4779575c3470c5368ae51 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198989 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Tested-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200522 diff --git a/cui/uiconfig/ui/widgettestdialog.ui b/cui/uiconfig/ui/widgettestdialog.ui index e800bd6423e5..44f5ee966791 100644 --- a/cui/uiconfig/ui/widgettestdialog.ui +++ b/cui/uiconfig/ui/widgettestdialog.ui @@ -157,6 +157,11 @@ <property name="has-entry">True</property> <property name="entry-text-column">0</property> <property name="id-column">1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="combo_box_disable-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="widgettestdialog|combo_box_disable-atkobject">Test Type</property> + </object> + </child> <child internal-child="entry"> <object class="GtkEntry"> <property name="sensitive">False</property>
