sw/source/ui/misc/docfnote.cxx | 2 +- sw/uiconfig/swriter/ui/endnotepage.ui | 12 ++++++++++-- sw/uiconfig/swriter/ui/footnotepage.ui | 17 ++++++++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-)
New commits: commit b36fd0ef0c4fe67cb6179604960e35104d54f52f Author: Parth Raiyani <[email protected]> AuthorDate: Wed Jan 28 16:08:08 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Jan 29 13:31:57 2026 +0100 a11y: fix accessibility issue in footnote and endnote page ui - rename conflicting label ids - add mnemonic-widget in GtkLabel to correctly reference relevant object Signed-off-by: Parth Raiyani <[email protected]> Change-Id: I8fc046cd364b3968e65bbf0253eac643b556e465 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198316 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index a53cbab73814..6861a1ea4e5d 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -73,7 +73,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(weld::Container* pPage, weld::DialogCon , m_pSh(nullptr) , m_bPosDoc(false) , m_bEndNote(bEN) - , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box(u"numberinglb"_ustr))) + , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box(bEN ? u"endnotenumberinglb"_ustr : u"footnotenumberinglb"_ustr))) , m_xOffsetLbl(m_xBuilder->weld_label(u"offset"_ustr)) , m_xOffsetField(m_xBuilder->weld_spin_button(u"offsetnf"_ustr)) , m_xNumCountBox(m_xBuilder->weld_combo_box(u"countinglb"_ustr)) diff --git a/sw/uiconfig/swriter/ui/endnotepage.ui b/sw/uiconfig/swriter/ui/endnotepage.ui index 5f510c6de45d..32e37b286fd1 100644 --- a/sw/uiconfig/swriter/ui/endnotepage.ui +++ b/sw/uiconfig/swriter/ui/endnotepage.ui @@ -37,6 +37,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="endnotepage|label19">Numbering</property> <property name="xalign">0</property> + <property name="mnemonic-widget">endnotenumberinglb</property> </object> <packing> <property name="left_attach">0</property> @@ -49,6 +50,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="endnotepage|label22">Before</property> <property name="xalign">0</property> + <property name="mnemonic-widget">prefix</property> </object> <packing> <property name="left_attach">0</property> @@ -61,6 +63,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="endnotepage|offset">Start at</property> <property name="xalign">0</property> + <property name="mnemonic-widget">offsetnf</property> </object> <packing> <property name="left_attach">0</property> @@ -73,6 +76,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="endnotepage|label25">After</property> <property name="xalign">0</property> + <property name="mnemonic-widget">suffix</property> </object> <packing> <property name="left_attach">0</property> @@ -131,11 +135,11 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="numberinglb"> + <object class="GtkComboBoxText" id="endnotenumberinglb"> <property name="visible">True</property> <property name="can_focus">False</property> <child internal-child="accessible"> - <object class="AtkObject" id="numberinglb-atkobject"> + <object class="AtkObject" id="endnotenumberinglb-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="endnotepage|extended_tip|numberinglb">Enter the number for the first endnote in the document.</property> </object> </child> @@ -184,6 +188,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="endnotepage|label20">Paragraph</property> <property name="xalign">0</property> + <property name="mnemonic-widget">parastylelb</property> </object> <packing> <property name="left_attach">0</property> @@ -196,6 +201,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="endnotepage|pagestyleft">Page</property> <property name="xalign">0</property> + <property name="mnemonic-widget">pagestylelb</property> </object> <packing> <property name="left_attach">0</property> @@ -240,6 +246,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="endnotepage|label27">Text area</property> <property name="xalign">0</property> + <property name="mnemonic-widget">charanchorstylelb</property> </object> <packing> <property name="left_attach">0</property> @@ -252,6 +259,7 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="endnotepage|label28">Endnote area</property> <property name="xalign">0</property> + <property name="mnemonic-widget">charstylelb</property> </object> <packing> <property name="left_attach">0</property> diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui index fe0beea84874..99158ef687e7 100644 --- a/sw/uiconfig/swriter/ui/footnotepage.ui +++ b/sw/uiconfig/swriter/ui/footnotepage.ui @@ -36,10 +36,11 @@ <property name="row-spacing">3</property> <property name="column-spacing">6</property> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkLabel" id="footnotelabel6"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|label6">Numbering:</property> + <property name="mnemonic-widget">footnotenumberinglb</property> <property name="xalign">0</property> </object> <packing> @@ -52,6 +53,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|offset">Start at:</property> + <property name="mnemonic-widget">offsetnf</property> <property name="xalign">0</property> </object> <packing> @@ -64,6 +66,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|label8">Before:</property> + <property name="mnemonic-widget">prefix</property> <property name="xalign">0</property> </object> <packing> @@ -95,6 +98,7 @@ <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|label7">Counting:</property> <property name="xalign">0</property> + <property name="mnemonic-widget">countinglb</property> </object> <packing> <property name="left-attach">0</property> @@ -107,6 +111,7 @@ <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|label11">After:</property> <property name="xalign">0</property> + <property name="mnemonic_widget">suffix</property> </object> <packing> <property name="left-attach">0</property> @@ -232,11 +237,11 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="numberinglb"> + <object class="GtkComboBoxText" id="footnotenumberinglb"> <property name="visible">True</property> <property name="can-focus">False</property> <child internal-child="accessible"> - <object class="AtkObject" id="numberinglb-atkobject"> + <object class="AtkObject" id="footnotenumberinglb-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="footnotepage|extended_tip|numberinglb">Select the numbering scheme that you want to use.</property> </object> </child> @@ -290,6 +295,7 @@ <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|label17">End of footnote:</property> <property name="xalign">0</property> + <property name="mnemonic_widget">conted</property> </object> <packing> <property name="left-attach">0</property> @@ -302,6 +308,7 @@ <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|label18">Start of next page:</property> <property name="xalign">0</property> + <property name="mnemonic_widget">contfromed</property> </object> <packing> <property name="left-attach">0</property> @@ -386,6 +393,7 @@ <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|label4">Paragraph:</property> <property name="xalign">0</property> + <property name="mnemonic_widget">parastylelb</property> </object> <packing> <property name="left-attach">0</property> @@ -398,6 +406,7 @@ <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|pagestyleft">Page:</property> <property name="xalign">0</property> + <property name="mnemonic_widget">pagestylelb</property> </object> <packing> <property name="left-attach">0</property> @@ -478,6 +487,7 @@ <property name="max-width-chars">15</property> <property name="track-visited-links">False</property> <property name="xalign">0</property> + <property name="mnemonic_widget">charanchorstylelb</property> </object> <packing> <property name="left-attach">0</property> @@ -490,6 +500,7 @@ <property name="can-focus">False</property> <property name="label" translatable="yes" context="footnotepage|pagestyleft">Anchor in footnote:</property> <property name="xalign">0</property> + <property name="mnemonic_widget">charstylelb</property> </object> <packing> <property name="left-attach">0</property>
