sfx2/source/dialog/dinfdlg.cxx | 3 --- vcl/qt5/QtInstanceComboBox.cxx | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)
New commits: commit 930e1a2956535c00e19c6ff89b3f15db11883d50 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Aug 13 23:22:05 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Aug 14 07:52:28 2025 +0200 tdf#130857 qt weld: Use correct method name in SAL_WARN output Change-Id: I30422f9154f37cf13dfcee17e97c38b51b2a31fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189541 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceComboBox.cxx b/vcl/qt5/QtInstanceComboBox.cxx index eaba58fe9aa7..405f6268def1 100644 --- a/vcl/qt5/QtInstanceComboBox.cxx +++ b/vcl/qt5/QtInstanceComboBox.cxx @@ -244,7 +244,7 @@ void QtInstanceComboBox::set_entry_width_chars(int) { // see also QtInstanceEntry::set_width_chars, might be able to reuse logic once // that is implemented - SAL_WARN("vcl.qt", "QtInstanceComboBox::set_width_chars not implemented yet"); + SAL_WARN("vcl.qt", "QtInstanceComboBox::set_entry_width_chars not implemented yet"); } void QtInstanceComboBox::set_entry_max_length(int) { assert(false && "Not implemented yet"); } commit b583b3de795854141a754a632aa34eeb0974a55f Author: Michael Weghorn <[email protected]> AuthorDate: Wed Aug 13 22:59:13 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Aug 14 07:52:19 2025 +0200 tdf#130857 a11y: Don't set a11y relation and name for "Custom Properties" In the "Custom Properties" page of the "File" -> "Properties" dialog, don't set both, an accessible name based on the text of the label of the "column" *and* a labelled-by relation to that label, as this is redundant. Therefore, stop setting the labelled-by relation. Using weld::Widget::set_accessible_relation_labeled_by doesn't match with its intended use as described in include/vcl/weld.hxx: // After this call this widget is only accessibility labelled by pLabel and // pLabel only accessibility labels this widget virtual void set_accessible_relation_labeled_by(weld::Widget* pLabel) = 0; For the "Custom Properties" page, this relation was set for each line (i.e. for each property), i.e. if multiple properties were added using the "Add Property" line, the "pLabel only accessibility labels this widget" assumption mentioned above wouldn't hold. Looking at the a11y relations in Accerciser (with either the qt6 or gtk3 VCL plugin in use) would reveal that e.g. all the "Name" comboboxes had the labelled-by relation to the label set, but the label only had a single label-for relation set, i.e. this was also inconsistent. This also simplifies supporting this dialog with native Qt widgets using SAL_VCL_QT_USE_WELDED_WIDGETS=1 in an upcoming commit, because QtInstanceWidget::set_accessible_relation_labeled_by hasn't been implemented yet and would trigger an assert. (But that still needs to be handled later for other cases.) Change-Id: Iabd1f077d47701b90de63181c822f16c841aaf91 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189540 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 08588c950466..dd8a1f6becce 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1694,11 +1694,8 @@ void CustomPropertiesWindow::AddLine(const OUString& sName, Any const & rAny) void CustomPropertiesWindow::CreateNewLine() { CustomPropertyLine* pNewLine = new CustomPropertyLine(this, &m_rBody); - pNewLine->m_xNameBox->set_accessible_relation_labeled_by(&m_rHeaderAccName); pNewLine->m_xNameBox->set_accessible_name(m_rHeaderAccName.get_label()); - pNewLine->m_xTypeBox->set_accessible_relation_labeled_by(&m_rHeaderAccType); pNewLine->m_xTypeBox->set_accessible_name(m_rHeaderAccType.get_label()); - pNewLine->m_xValueEdit->set_accessible_relation_labeled_by(&m_rHeaderAccValue); pNewLine->m_xValueEdit->set_accessible_name(m_rHeaderAccValue.get_label()); m_aCustomPropertiesLines.emplace_back( pNewLine );
