core.git: Branch 'distro/collabora/co-24.04' - svx/uiconfig vcl/source

[Antony (via logerrit)]

 svx/uiconfig/ui/sidebarstylespanel.ui |    5 +++++
 svx/uiconfig/ui/sidebartextpanel.ui   |   10 ++++++++++
 vcl/source/window/window.cxx          |   11 +++++++++++
 3 files changed, 26 insertions(+)

New commits:
commit ca31493ad56647cf5d11dccaf70fa225327fab51
Author:     Antony <antonydas.na...@collabora.com>
AuthorDate: Thu Apr 4 13:10:16 2024 +0530
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Apr 4 13:47:08 2024 +0200

    a11y: Enable accessibility for comboboxes in sidebar
    
    * Updated window.cxx:Window::DumpAsPropertyTree to include accessibility 
data in the output
    * Added accessibility info to comboboxes inside sidebarstylespanel.ui & 
sidebartextpanel.ui
    
    * Reverted unwanted ui version change introduced due to glade
    
    Change-Id: If6833c9f42dbab90fb6277ed932062d86cf53416
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165782
    Reviewed-by: Marco Cecchetti <marco.cecche...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/svx/uiconfig/ui/sidebarstylespanel.ui 
b/svx/uiconfig/ui/sidebarstylespanel.ui
index 8bbb37496770..4204801d024a 100644
--- a/svx/uiconfig/ui/sidebarstylespanel.ui
+++ b/svx/uiconfig/ui/sidebarstylespanel.ui
@@ -41,6 +41,11 @@
                         <property name="truncate-multiline">True</property>
                       </object>
                     </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="applystyle-atkobject">
+                        <property name="AtkObject::accessible-name" 
translatable="yes" context="fontstyletoolbox|applystyle">Font style</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui 
b/svx/uiconfig/ui/sidebartextpanel.ui
index 97a92d97a0f5..b53b9e2e36c8 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -41,6 +41,11 @@
                         <property name="truncate-multiline">True</property>
                       </object>
                     </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" 
id="fontnamecombobox-atkobject">
+                        <property name="AtkObject::accessible-name" 
translatable="yes" context="font|fontnamecombobox">Font</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -78,6 +83,11 @@
                         <property name="truncate-multiline">True</property>
                       </object>
                     </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" 
id="fontsizecombobox-atkobject">
+                        <property name="AtkObject::accessible-name" 
translatable="yes" context="font|fontsizecombobox">Font size</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 3da1dfe90de3..b57aee6cccf1 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3401,6 +3401,17 @@ void Window::DumpAsPropertyTree(tools::JsonWriter& 
rJsonWriter)
     if (pAccLabelledBy)
         rJsonWriter.put("labelledBy", pAccLabelledBy->get_id());
 
+    if(!pAccLabelFor && !pAccLabelledBy)
+    {
+        auto aAria = rJsonWriter.startNode("aria");
+
+        OUString sAccString = GetAccessibleName();
+        rJsonWriter.put("label", sAccString);
+
+        sAccString = GetAccessibleDescription();
+        rJsonWriter.put("description", sAccString);
+    }
+
     mpWindowImpl->maDumpAsPropertyTreeHdl.Call(rJsonWriter);
 }