core.git: 2 commits - vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/unx/gtk4/a11y.cxx |   29 ++---
 1 file changed, 2 insertions(+), 27 deletions(-)

New commits:
commit f6ca163d3f6383d3a48dbdacc5410e630d678ea1
Author: Michael Weghorn 
AuthorDate: Fri Apr 26 12:43:24 2024 +0200
Commit: Michael Weghorn 
CommitDate: Fri Apr 26 20:18:30 2024 +0200

gtk4 a11y: Don't create second AT context for OOoFixed

Similar to how the previous

Change-Id: I35196ca686e9d56f97bbf884da8b6492358e41fc
Author: Michael Weghorn 
Date:   Fri Apr 26 09:45:39 2024 +0200

gtk4 a11y: Don't create multiple AT contexts for same accessible

avoids creating multiple AT contexts for the same
accessible when the role changes, this commit addresses
another case in which 2 GtkATContexts could be created
for the OOoFixed which could result in segfault crashes:

The OOoFixed is a GtkWidget, and GTK's `gtk_widget_init`
already creates an AT context for widgets.
Then, a second AT context would be created because
`ooo_fixed_accessible_init` set an own implementation
for GtkAccessibleInterface::get_at_context that would
create a second AT context when it got called, resulting
in breaking the apparent assumption that there's a 1:1 mapping
between GtkAccessible and GtkATConetxt.

No longer override `GtkAccessibleInterface::get_at_context`
but live with the GtkATContext created for the GtkWidget,
even if that means an a11y role cannot explicitly be set
for these for now.
From a first quick look at the tree in Accerciser,
I only see one item changed its a11y role from panel to filler.

The main class used. e.g. for the document content is
LOAccessible, not OOoFixed, and setting the proper role
for instances of that class is unaffected, see
`lo_accessible_get_at_context`.

If setting the a11y role is relevant, this could be
done when initializing the OOoFixed instead by setting
the "accessible-role" property [1], tested with this demo
local change to set a dummy table-cell a11y role and
verifying in Accerciser that it was actually set:

--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -993,7 +993,10 @@ void GtkSalFrame::InitCommon()
 #else
 m_pOverlay = GTK_OVERLAY(gtk_overlay_new());
 #if GTK_CHECK_VERSION(4,9,0)
-m_pFixedContainer = GTK_FIXED(g_object_new( ooo_fixed_get_type(), 
nullptr ));
+GValue aValue = G_VALUE_INIT;
+g_value_init (, GTK_TYPE_ACCESSIBLE_ROLE);
+g_value_set_enum(, GTK_ACCESSIBLE_ROLE_CELL);
+m_pFixedContainer = GTK_FIXED(g_object_new( ooo_fixed_get_type(), 
"accessible-role", aValue,  nullptr ));
 #else
 m_pFixedContainer = GTK_FIXED(gtk_fixed_new());
 #endif

Similar to how the dropped code did, this could use the
a11y role from the corresponding `vcl::Window`, which is
currently not passed, but that could be adjusted, e.g.
by either passing the window or its accessible info
to `SalInstance::CreateFrame`/`SalInstance::CreateChildFrame`.
See `Window::ImplInit`, where the `vcl::Window` is currently
only set via `SalFrame::SetCallback` after the call to
`SalInstance::CreateFrame`/`SalInstance::CreateChildFrame`.

Without this commit, for me, this crash happened about 10-30 %
of the time when starting LO Writer with the gtk4 VCL plugin in rr,
when Accerciser was running already.

Backtrace for first AT context creation (from `gtk_widget_init`):

1 gtk_at_context_create gtkatcontext.c 671 0x7f677daf129e
2 create_at_context gtkwidget.c 8574 0x7f677dd6bcd9
3 gtk_widget_init gtkwidget.c 2392 0x7f677dd5edbc
4 g_type_create_instance 0x7f678ed8f2a3
5 ?? 0x7f678ed72500
6 g_object_new_with_properties 0x7f678ed73b96
7 g_object_new 0x7f678ed74a41
8 GtkSalFrame::InitCommon gtkframe.cxx 996 0x7f677edb9243
9 GtkSalFrame::Init gtkframe.cxx 1785 0x7f677edb7bca
10 GtkSalFrame::GtkSalFrame gtkframe.cxx 510 0x7f677edb726d
11 GtkInstance::CreateFrame gtkinst.cxx 273 0x7f677ec7cebc
12 vcl::Window::ImplInit window.cxx 1057 0x7f6788cf7f49
13 ImplBorderWindow::ImplInit brdwin.cxx 1555 0x7f6788a6d45b
14 ImplBorderWindow::ImplBorderWindow brdwin.cxx 1584 0x7f6788a6da21
15 VclPtrInstance::VclPtrInstance vclptr.hxx 280 0x7f6788d31049
16 WorkWindow::ImplInit wrkwin.cxx 51 0x7f6788d2f809
17 IntroWindow::IntroWindow introwin.cxx 35 0x7f6788bb7ee0
18 (anonymous namespace)::SplashScreenWindow::SplashScreenWindow 
splash.cxx 122 0x7f677c1cee61
19 VclPtr<(anonymous namespace)::SplashScreenWindow>::Create<(anonymous 
namespace)::SplashScreen *> vclptr.hxx 129 0x7f677c1cc86b
20 (anonymous namespace)::SplashScreen::SplashScreen splash.cxx 145 

core.git: vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/unx/gtk4/convert3to4.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 0c3fb583b9fdbbc634a5cabe578d3e717c36bff6
Author: Michael Weghorn 
AuthorDate: Thu Apr 25 10:11:15 2024 +0200
Commit: Michael Weghorn 
CommitDate: Thu Apr 25 18:00:35 2024 +0200

gtk4: Ignore "input-purpose" for GtkSpinButton

"input-purpose" is a property of GtkEntry, for both,
GTK 3 [1] and GTK 4 [2].

However, while the GTK 3 GtkSpinButton derives from GtkEntry [3],
the GTK 4 one doesn't any more but it derives directly from
GtkWidget [4].

Therefore, after

commit 139199ee9c09d25624191132adbe4fd29365eb7a
Date:   Thu Feb 22 00:03:01 2024 -0900

tdf#141728 Revamp sw navigator go to page spin control

, opening the navigator by pressing F5 in Writer when
using the gtk4 VCL plugin triggered the following assert:

warn:vcl.gtk:233860:233860:vcl/unx/gtk4/convert3to4.cxx:1595: 
GtkInstanceBuilder: error when calling gtk_builder_add_from_string: .:197:65 
Invalid property: GtkSpinButton.input-purpose
soffice.bin: 
/home/michi/development/git/libreoffice/vcl/unx/gtk4/convert3to4.cxx:1598: void 
builder_add_from_gtk3_file(GtkBuilder *, const OUString &): Assertion `rc && 
"could not load UI file"' failed.

Just ignore that property for gtk4.

[1] https://docs.gtk.org/gtk3/property.Entry.input-purpose.html
[2] https://docs.gtk.org/gtk4/property.Entry.input-purpose.html
[3] https://docs.gtk.org/gtk3/class.SpinButton.html
[4] https://docs.gtk.org/gtk4/class.SpinButton.html

Change-Id: Ia3ece9fdf0269dc5178786fc64644ab3f0433871
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166618
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 16c7403bb261..ffbda70037ad 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -541,6 +541,13 @@ ConvertResult Convert3To4(const 
css::uno::Reference& xNode
 xRemoveList.push_back(xChild);
 }
 
+if (sName == "input-purpose" && GetParentObjectType(xChild) == 
"GtkSpinButton")
+{
+// "input-purpose" is a property of GtkEntry, but
+// GTK 4 GtkSpinButton no longer derives from GtkEntry
+xRemoveList.push_back(xChild);
+}
+
 if (sName == "truncate-multiline")
 {
 if (GetParentObjectType(xChild) == "GtkSpinButton")

core.git: 2 commits - accessibility/source dbaccess/source editeng/source offapi/com sc/source sd/source svx/source sw/source test/source toolkit/source vcl/osx vcl/qa vcl/qt5 vcl/source vcl/unx winac

[Michael Weghorn (via logerrit)]

 accessibility/source/extended/accessiblelistboxentry.cxx   |2 
 accessibility/source/extended/textwindowaccessibility.cxx  |6 +-
 accessibility/source/standard/floatingwindowaccessible.cxx |2 
 accessibility/source/standard/vclxaccessiblelist.cxx   |2 
 accessibility/source/standard/vclxaccessibleradiobutton.cxx|2 
 dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx|2 
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx   |   10 ++--
 editeng/source/accessibility/AccessibleEditableTextPara.cxx|8 +--
 offapi/com/sun/star/accessibility/AccessibleRelation.idl   |2 
 offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl |1 
 sc/source/ui/Accessibility/AccessibleCell.cxx  |4 -
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx|4 -
 sc/source/ui/Accessibility/AccessibleEditObject.cxx|4 -
 sd/source/console/PresenterAccessibility.cxx   |4 -
 svx/source/accessibility/AccessibleControlShape.cxx|2 
 svx/source/accessibility/AccessibleShape.cxx   |2 
 svx/source/accessibility/svxrectctaccessiblecontext.cxx|2 
 sw/source/core/access/accpara.cxx  |4 -
 sw/source/core/access/acctextframe.cxx |2 
 test/source/a11y/accessibletestbase.cxx|   10 +---
 toolkit/source/awt/vclxaccessiblecomponent.cxx |6 +-
 vcl/osx/a11ywrapper.mm |   12 ++---
 vcl/qa/cppunit/a11y/atspi2/atspi2.cxx  |3 -
 vcl/qt5/QtAccessibleWidget.cxx |2 
 vcl/source/app/salvtables.cxx  |4 -
 vcl/unx/gtk3/a11y/atkwrapper.cxx   |5 --
 winaccessibility/source/UAccCOM/AccRelation.cxx|8 +--
 winaccessibility/source/UAccCOM/MAccessible.cxx|   22 
--
 28 files changed, 64 insertions(+), 73 deletions(-)

New commits:
commit d4f6534e8870e8f271984c37ce54a6878f372ae1
Author: Michael Weghorn 
AuthorDate: Wed Apr 24 14:39:46 2024 +0200
Commit: Michael Weghorn 
CommitDate: Wed Apr 24 23:04:35 2024 +0200

[API CHANGE] a11y: Use XAccessible for relation targets

Use a Sequence of XAccessible rather than its base
interface XInterface for AccessibleRelation's TargetSet.

As the targets are accessible objects as well,
anything other than XAccessible doesn't make much sense.
Using XAccessible right away makes that clearer and avoids
the need to query the XAccessible interface.

(The winaccessibility bridge was already using
`static_cast`, relying on the fact that the objects
are XAccessibles.)

The a11y UNO API is not published, so an API change
should be unproblematic.

Change-Id: I7f08e98d1ec303d5343d9a7954187cdd71495ebc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166586
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins

diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx 
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 6c8fa6fc26dc..a843b938b9a3 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -463,7 +463,7 @@ namespace accessibility
 if ( xParent.is() )
 {
 rtl::Reference 
pRelationSetHelper = new utl::AccessibleRelationSetHelper;
-Sequence< Reference< XInterface > > aSequence { xParent };
+Sequence> aSequence { xParent };
 pRelationSetHelper->AddRelation(
 AccessibleRelation( AccessibleRelationType::NODE_CHILD_OF, 
aSequence ) );
 xRelSet = pRelationSetHelper;
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx 
b/accessibility/source/extended/textwindowaccessibility.cxx
index f1ccc69c413d..5cef04128d82 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1293,14 +1293,14 @@ Document::retrieveParagraphRelationSet( Paragraph const 
* pParagraph )
 
 if ( aPara > m_aVisibleBegin && aPara < m_aVisibleEnd )
 {
-css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > 
aSequence { getAccessibleChild( aPara - 1 ) };
+
css::uno::Sequence> 
aSequence { getAccessibleChild(aPara - 1) };
 css::accessibility::AccessibleRelation aRelation( 
css::accessibility::AccessibleRelationType::CONTENT_FLOWS_FROM, aSequence );
 pRelationSetHelper->AddRelation( aRelation );
 }
 
 if ( aPara >= m_aVisibleBegin && aPara < m_aVisibleEnd -1 )
 {
-css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > 
aSequence { getAccessibleChild( aPara + 1 ) };
+
css::uno::Sequence> 

core.git: 2 commits - winaccessibility/source

[Michael Weghorn (via logerrit)]

 winaccessibility/source/UAccCOM/MAccessible.cxx |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 31a4062bc0f3a751d3758a2d9b3ebb4fe9010590
Author: Michael Weghorn 
AuthorDate: Tue Apr 23 09:26:34 2024 +0100
Commit: Michael Weghorn 
CommitDate: Tue Apr 23 20:52:57 2024 +0200

wina11y: Use AccessibleRelationType::MEMBER_OF constant

... instead of hard-coded 7.

Change-Id: I2ac44719043c827ce2a65687be021d7f823898d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166505
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins

diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx 
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 3f261e9d4bd7..8694ef418bbc 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -1792,7 +1792,7 @@ static XAccessible* getTheParentOfMember(XAccessible* 
pXAcc)
 for(sal_Int32 i=0 ; igetRelation(i);
-if(accRelation.RelationType == 7)
+if (accRelation.RelationType == AccessibleRelationType::MEMBER_OF)
 {
 Sequence< Reference< XInterface > > xTargets = 
accRelation.TargetSet;
 return static_cast(xTargets[0].get());
@@ -1861,7 +1861,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CMAccessible::get_groupPosition(long __RPC_FAR
 for(int i=0 ; igetRelation(i);
-if(accRelation.RelationType == 7)
+if (accRelation.RelationType == 
AccessibleRelationType::MEMBER_OF)
 {
 Sequence< Reference< XInterface > > xTargets = 
accRelation.TargetSet;
 
commit b97ff95cc2ef4c1da83c5889690b7a703f5c0699
Author: Michael Weghorn 
AuthorDate: Tue Apr 23 09:08:33 2024 +0100
Commit: Michael Weghorn 
CommitDate: Tue Apr 23 20:52:49 2024 +0200

wina11y: Use AccessibleRelationType constants

Use `AccessibleRelationType::LABELED_BY` and
`AccessibleRelationType::LABEL_FOR` instead of
hard-coded numbers 6 and 5.

While at it, also rename the misspelt
"pRLebelContext" to "xLabelContext".

Change-Id: Id4e5cec0f04b9257eb141fd9bac64e7f01fa32ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166504
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins

diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx 
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 6c1367185cac..3f261e9d4bd7 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -706,7 +707,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CMAccessible::get_accKeyboardShortcut(VARIANT
 AccessibleRelation accRelation;
 for(int i=0; igetRelation(i).RelationType == 
6 )
+if (pRrelationSet->getRelation(i).RelationType == 
AccessibleRelationType::LABELED_BY)
 {
 accRelation = pRrelationSet->getRelation(i);
 paccRelation = 
@@ -721,17 +722,17 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CMAccessible::get_accKeyboardShortcut(VARIANT
 
 XAccessible* pXAcc = 
static_cast(pRAcc.get());
 
-Reference pRLebelContext = 
pXAcc->getAccessibleContext();
-if(!pRLebelContext.is())
+Reference xLabelContext = 
pXAcc->getAccessibleContext();
+if (!xLabelContext.is())
 return S_FALSE;
 
-pRrelationSet = 
pRLebelContext->getAccessibleRelationSet();
+pRrelationSet = 
xLabelContext->getAccessibleRelationSet();
 nRelCount = pRrelationSet->getRelationCount();
 
 paccRelation = nullptr;
 for(int j=0; jgetRelation(j).RelationType == 
5 )
+if (pRrelationSet->getRelation(j).RelationType == 
AccessibleRelationType::LABEL_FOR)
 {
 accRelation = pRrelationSet->getRelation(j);
 paccRelation = 
@@ -746,7 +747,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CMAccessible::get_accKeyboardShortcut(VARIANT
 return S_FALSE;
 }
 
-Reference 
pRXIE(pRLebelContext,UNO_QUERY);
+Reference 
pRXIE(xLabelContext, UNO_QUERY);
 if(!pRXIE.is())
 return S_FALSE;
 

core.git: offapi/com

[Michael Weghorn (via logerrit)]

 offapi/com/sun/star/accessibility/XAccessibleSelection.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c356b68656e57248123d333abd87803e4e89e8eb
Author: Michael Weghorn 
AuthorDate: Mon Apr 22 18:09:28 2024 +0200
Commit: Michael Weghorn 
CommitDate: Tue Apr 23 08:07:08 2024 +0200

Fix XAccessibleSelection::getSelectedAccessibleChild doc

The valid indices to pass as params to
`XAccessibleSelection::getSelectedAccessibleChild`
depend on the the number of selected children, i.e. the
return value of
`XAccessibleSelection::getSelectedAccessibleChildCount`.

The previously mentioned
`XAccessibleRelationSet::getAccessibleChildCount`
doesn't even exist.

Change-Id: Iaabbc9e3972c7a8274495e19978db9eae36077fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166466
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl 
b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
index 206d552ee259..8be6310ba6ef 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
@@ -117,7 +117,7 @@ interface XAccessibleSelection : 
::com::sun::star::uno::XInterface
 @throws ::com::sun::star::lang::IndexOutOfBoundsException
 if the given index does not lie in the valid range of 0 up to
 the result of
-XAccessibleRelationSet::getAccessibleChildCount()-1.
+XAccessibleSelection::getSelectedAccessibleChildCount()-1.
 */
 XAccessible getSelectedAccessibleChild ([in] hyper nSelectedChildIndex)
 raises (::com::sun::star::lang::IndexOutOfBoundsException);

core.git: editeng/source

[Michael Weghorn (via logerrit)]

 editeng/source/accessibility/AccessibleParaManager.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit f063aac5143f14226f3e909c3d0a87e040d03538
Author: Michael Weghorn 
AuthorDate: Mon Apr 22 17:54:42 2024 +0200
Commit: Michael Weghorn 
CommitDate: Tue Apr 23 08:06:38 2024 +0200

editeng a11y: Switch DBG_ASSERT to real assert

All current callers check the index before calling
`AccessibleParaManager::IsReferencable`.

Change-Id: If585e11eba3c48037b65439e8b95cb8d27bd4ffe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166465
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins

diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx 
b/editeng/source/accessibility/AccessibleParaManager.cxx
index c88f82d67709..aae8c5817f36 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -17,10 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
 // Global header
-
-
 #include 
 #include 
 #include 
@@ -29,10 +28,7 @@
 #include 
 #include 
 
-
 // Project-local header
-
-
 #include 
 #include 
 
@@ -116,8 +112,8 @@ namespace accessibility
 
 bool AccessibleParaManager::IsReferencable( sal_Int32 nChild ) const
 {
-DBG_ASSERT( 0 <= nChild && maChildren.size() > 
o3tl::make_unsigned(nChild),
-"AccessibleParaManager::IsReferencable: invalid index" );
+assert(0 <= nChild && maChildren.size() > o3tl::make_unsigned(nChild)
+   && "AccessibleParaManager::IsReferencable: invalid index");
 
 if( 0 <= nChild && maChildren.size() > o3tl::make_unsigned(nChild) )
 {

core.git: vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 94c97ecdbfa606401fb53685048731128186672b
Author: Michael Weghorn 
AuthorDate: Thu Apr 18 18:59:46 2024 +0200
Commit: Michael Weghorn 
CommitDate: Sat Apr 20 15:29:29 2024 +0200

gtk3 a11y: Set a11y relations for custom combobox impl

As described in more detail in the previous commit

Change-Id: If5faf77c5f82836c376c04bb6e4e42ce5a3023a2
Author: Michael Weghorn 
Date:   Thu Apr 18 14:02:25 2024 +0200

tdf#159910 gtk3 a11y: Keep a11y props for combobox

, the gtk3 VCL plugin uses a custom combobox implementation
rather than the stock GtkComboBox.

Similar to how the above commit makes sure that accessible
role, name and description set for the stock GtkComboBox
are also set in the custom implementation, do the same
for the accessible relations as well, by taking over
the relations from the GtkComboBox to the toggle
button of the custom implementation as well.

One particularly relevant relation in practice is
`ATK_RELATION_LABELLED_BY`, because the target set
via that relation is what screen readers tend to
announce when a combobox receives focus and doesn't
have an accessible name set for itself.

With this change in place, the Orca screen reader
announces the corresponding label e.g. in the
"Format" -> "Character" dialog in Writer, tab
"Font Effects", so e.g. "Overlining:, combobox"
is announced by Orca when the combobox for setting
the value for the overlining receives focus,
rather than just saying "combobox", which
wouldn't make clear to the user what this
combobox is for.

(This also matches what Orca already does for
the qt6 VCL plugin.)

This change only takes over the relations
set for the combobox itself. Usually, relations
are set both ways (e.g. the target of the
`ATK_RELATION_LABELLED_BY` relation would
itself have an `ATK_RELATION_LABEL_FOR`
relation with the combobox as a target).
If necessary, this solution could be
extended to also iterate over all the
target objects and check whether they
have relations with the combobox as a target
and set corresponding relations to the toggle
button as well (or instead).

Change-Id: I05e39ef5606ffa49ca7673039de3e1aa74fc8649
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166259
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index bcdcbc1c6157..41aa48dbed7f 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22172,6 +22172,7 @@ public:
 g_signal_connect(getContainer(), "query-tooltip", 
G_CALLBACK(signalComboTooltipQuery), this);
 }
 
+// take over a11y characteristics from the stock GtkComboBox to the 
toggle button
 if (AtkObject* pComboBoxAccessible = 
gtk_widget_get_accessible(GTK_WIDGET(m_pComboBox)))
 {
 if (AtkObject* pToggleButtonAccessible = 
gtk_widget_get_accessible(GTK_WIDGET(m_pToggleButton)))
@@ -22181,6 +22182,20 @@ public:
 atk_object_set_name(pToggleButtonAccessible, pName);
 if (const char* pDesc = 
atk_object_get_description(pComboBoxAccessible))
 atk_object_set_description(pToggleButtonAccessible, pDesc);
+
+if (AtkRelationSet* pComboBoxRelationSet = 
atk_object_ref_relation_set(pComboBoxAccessible))
+{
+AtkRelationSet* pToggleButtonRelationSet = 
atk_object_ref_relation_set(pToggleButtonAccessible);
+assert(pToggleButtonRelationSet);
+for (int i = 0; i < 
atk_relation_set_get_n_relations(pComboBoxRelationSet); i++)
+{
+AtkRelation* pRelation = 
atk_relation_set_get_relation(pComboBoxRelationSet, i);
+assert(pRelation);
+atk_relation_set_add(pToggleButtonRelationSet, 
pRelation);
+}
+g_object_unref(pComboBoxRelationSet);
+g_object_unref(pToggleButtonRelationSet);
+}
 }
 }
 

core.git: vcl/uiconfig vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/uiconfig/ui/combobox.ui |5 +
 vcl/unx/gtk3/gtkinst.cxx|   12 
 2 files changed, 17 insertions(+)

New commits:
commit 1e851093f0148d2c55fc3fd377d274f6703c71c9
Author: Michael Weghorn 
AuthorDate: Thu Apr 18 14:02:25 2024 +0200
Commit: Michael Weghorn 
CommitDate: Sat Apr 20 15:28:58 2024 +0200

tdf#159910 gtk3 a11y: Keep a11y props for combobox

Due to various issues with GtkComboBox, the gtk3 VCL
plugin does not use the original GtkComboBox, but a
custom implementation, originally
introduced in

commit bc0e0f633b05c4f91b6695488fc9e5c127507ba5
Date:   Thu Apr 9 11:41:00 2020 +0100

tdf#131120 use a replacement for GtkComboBox

(See full commit message for more details and reasons.)

This means that the accessible role, name and description
from the .ui file are not set automatically for the
GtkToggleButton widget that acts as the combobox
instead and receives keyboard focus.

In order to make these available for AT, explicitly
take these over from the original GtkComboBox.

With this in place, the Orca screen reader now
e.g. properly announces the comboboxes in Writer's
Navigator as "Navigate By, combobox" and
"Active window, combobox" (similar to how it already
does for the qt6 VCL plugin), rather than just saying
"toggle button, not pressed", which didn't give any hint
to the user what the currently focused UI element
is about and how to interact with it.

Also set a default a11y role of combo-box in
the replacement's .ui file. (The role from
the GtkComboBox's AtkObject should always override
that in practice, though.)

Change-Id: If5faf77c5f82836c376c04bb6e4e42ce5a3023a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166248
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/uiconfig/ui/combobox.ui b/vcl/uiconfig/ui/combobox.ui
index a0b72e27821f..6abaa6a25171 100644
--- a/vcl/uiconfig/ui/combobox.ui
+++ b/vcl/uiconfig/ui/combobox.ui
@@ -51,6 +51,11 @@
 
   
 
+
+  
+combo-box
+  
+
 
   
 
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f35dad49d141..bcdcbc1c6157 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22172,6 +22172,18 @@ public:
 g_signal_connect(getContainer(), "query-tooltip", 
G_CALLBACK(signalComboTooltipQuery), this);
 }
 
+if (AtkObject* pComboBoxAccessible = 
gtk_widget_get_accessible(GTK_WIDGET(m_pComboBox)))
+{
+if (AtkObject* pToggleButtonAccessible = 
gtk_widget_get_accessible(GTK_WIDGET(m_pToggleButton)))
+{
+atk_object_set_role(pToggleButtonAccessible, 
atk_object_get_role(pComboBoxAccessible));
+if (const char* pName = 
atk_object_get_name(pComboBoxAccessible))
+atk_object_set_name(pToggleButtonAccessible, pName);
+if (const char* pDesc = 
atk_object_get_description(pComboBoxAccessible))
+atk_object_set_description(pToggleButtonAccessible, pDesc);
+}
+}
+
 insertAsParent(GTK_WIDGET(m_pComboBox), GTK_WIDGET(getContainer()));
 gtk_widget_set_visible(GTK_WIDGET(m_pComboBox), false);
 gtk_widget_set_no_show_all(GTK_WIDGET(m_pComboBox), true);

core.git: 2 commits - sw/uiconfig vcl/uiconfig

[Michael Weghorn (via logerrit)]

 sw/uiconfig/swriter/ui/navigatorpanel.ui |5 ++
 vcl/uiconfig/ui/combobox.ui  |   75 ++-
 2 files changed, 41 insertions(+), 39 deletions(-)

New commits:
commit 9bb46a8e9819fa74dee53b305a4255bb72a89e22
Author: Michael Weghorn 
AuthorDate: Thu Apr 18 13:50:12 2024 +0200
Commit: Michael Weghorn 
CommitDate: Sat Apr 20 15:28:24 2024 +0200

tdf#159910 gtk3: Resave vcl/uiconfig/ui/combobox.ui with glade 3.40

... before doing more changes to the file in an upcoming
commit, to keep the diff clearer.

Change-Id: I3da5d9d708681888418251139e1d5aad4c152ad6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166247
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/uiconfig/ui/combobox.ui b/vcl/uiconfig/ui/combobox.ui
index 23cfe7ed9e31..a0b72e27821f 100644
--- a/vcl/uiconfig/ui/combobox.ui
+++ b/vcl/uiconfig/ui/combobox.ui
@@ -1,18 +1,18 @@
 
-
+
 
   
   
 combobox
 True
-False
-True
+False
+True
 
   
 True
-True
-True
-True
+True
+True
+True
 True
 
   
@@ -27,25 +27,25 @@