cui/uiconfig/ui/numberingoptionspage.ui | 32 +++++++++++++------------------- vcl/source/window/accessibility.cxx | 11 +++++++++-- 2 files changed, 22 insertions(+), 21 deletions(-)
New commits: commit d23fa60e048d5dedbcb9c4dadcdf38740100ee45 Author: codewithvk <[email protected]> AuthorDate: Mon Feb 2 14:21:51 2026 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Feb 26 23:59:15 2026 +0100 fix(vcl): skip mnemonic-widget as implied label when explicit label-for exists Signed-off-by: codewithvk <[email protected]> Change-Id: I528eec7e6fad7ae35ed12991d32c2f9131497519 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198516 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200510 diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index e65b4940c22f..be1a74b6c25a 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -648,13 +648,20 @@ vcl::Window* Window::GetAccessibleRelationLabeledBy() const auto const& aMnemonicLabels = list_mnemonic_labels(); if (!aMnemonicLabels.empty()) { - //if we have multiple labels, then prefer the first that is visible for (auto const & rCandidate : aMnemonicLabels) { + if (rCandidate->mpWindowImpl->mpAccessibleInfos + && rCandidate->mpWindowImpl->mpAccessibleInfos->pLabelForWindow) + continue; + if (rCandidate->IsVisible()) return rCandidate; } - return aMnemonicLabels[0]; + // only sent mnemonic label if explicit label-for not exist + auto const& pFallback = aMnemonicLabels[0]; + if (!(pFallback->mpWindowImpl->mpAccessibleInfos + && pFallback->mpWindowImpl->mpAccessibleInfos->pLabelForWindow)) + return pFallback; } // Avoid searching when using LOKit (jsdialog) - it can slow down dumping to json when we have a huge hierarchy commit 09e5cad20edbe100c8e4359a43a3a8d4264e3595 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jan 29 11:49:15 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Feb 26 23:59:06 2026 +0100 align labels to the typical left so that the indent of the frame that encloses before/after visually groups those together but remain distinct from the following 'Graphics' drop the bold from this intermediate frame label heading Change-Id: I170ecd321567b780ed2fc0413d89a5537c78a980 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198362 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200509 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui index 2ed6fef156d1..1e9ff53b267b 100644 --- a/cui/uiconfig/ui/numberingoptionspage.ui +++ b/cui/uiconfig/ui/numberingoptionspage.ui @@ -167,7 +167,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|label4">Number:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">numfmtlb</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -252,7 +252,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|startatft">Start at:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">startat</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -285,7 +285,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|bitmapft">Graphics:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">bitmap</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -299,7 +299,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|orientft">Alignment:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">orientlb</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -436,7 +436,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|prefixft">Before:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">prefix</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -467,7 +467,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|suffixft">After:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">suffix</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -498,9 +498,6 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes" context="numberingoptionspage|separator">Separator</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> @@ -519,7 +516,7 @@ <property name="use-underline">True</property> <property name="mnemonic-widget">sublevels</property> <property name="ellipsize">end</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -533,7 +530,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|bulletft">Character:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">bullet</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -547,7 +544,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|relsizeft">_Relative size:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">relsize</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -561,7 +558,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|colorft">Color:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">color</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -575,7 +572,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|charstyleft">Character style:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">charstyle</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> @@ -595,7 +592,7 @@ <property name="label" translatable="yes" context="numberingoptionspage|widthft">Width:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">widthmf</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -611,7 +608,7 @@ <property name="use-underline">True</property> <property name="mnemonic-widget">heightmf</property> <property name="ellipsize">end</property> - <property name="xalign">1</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -760,9 +757,6 @@ <child> <placeholder/> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property>
