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 | 4 +-- cui/uiconfig/ui/similaritysearchdialog.ui | 4 +-- sw/uiconfig/swriter/ui/picturepage.ui | 4 +-- 8 files changed, 34 insertions(+), 34 deletions(-)
New commits: commit 2fc15203326cd5fb3dc02ec51fc9421d32b29cf1 Author: Parth Raiyani <[email protected]> AuthorDate: Tue Feb 10 13:19:24 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 10 11:27:11 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]> diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 5e90fc88725d..7e8ec21a69c4 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -149,11 +149,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 d7a4e934fc6f..a6dce6bfe55e 100644 --- a/cui/uiconfig/ui/borderpage.ui +++ b/cui/uiconfig/ui/borderpage.ui @@ -230,7 +230,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> @@ -313,7 +313,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> @@ -333,7 +333,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> @@ -721,7 +721,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 93f3eafe504a..a203330c8d42 100644 --- a/cui/uiconfig/ui/croppage.ui +++ b/cui/uiconfig/ui/croppage.ui @@ -112,7 +112,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> @@ -140,7 +140,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> @@ -180,7 +180,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> @@ -194,7 +194,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> @@ -360,7 +360,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> @@ -387,7 +387,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> @@ -446,7 +446,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> @@ -474,7 +474,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> @@ -522,14 +522,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 74f7eb409c5c..89d883c321ef 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 e7bc05e138e4..54008fc8a420 100644 --- a/cui/uiconfig/ui/password.ui +++ b/cui/uiconfig/ui/password.ui @@ -167,7 +167,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> @@ -212,7 +212,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> @@ -299,7 +299,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> @@ -344,7 +344,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 8fc381928d76..cbd3b9dccad7 100644 --- a/cui/uiconfig/ui/rotationtabpage.ui +++ b/cui/uiconfig/ui/rotationtabpage.ui @@ -222,7 +222,7 @@ <property name="valign">start</property> <property name="spacing">12</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> @@ -340,7 +340,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 cf9e51c4ac26..009e69b8d7ae 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> @@ -131,7 +131,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 8ff88130efae..bc2682f5ca14 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>
