cui/source/inc/whatsnew.hxx | 12 ++++++++----
svx/uiconfig/ui/sidebarstylespanel.ui | 5 +++++
svx/uiconfig/ui/sidebartextpanel.ui | 10 ++++++++++
vcl/source/window/window.cxx | 11 +++++++++++
4 files changed, 34 insertions(+), 4 deletions(-)
New commits:
commit 2f15866d8502c74513e19f7a6e3074c97f162725
Author: Antony <antonydas.na...@collabora.com>
AuthorDate: Thu Apr 4 13:10:16 2024 +0530
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Apr 5 12:59:30 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>
(cherry picked from commit ca31493ad56647cf5d11dccaf70fa225327fab51)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165725
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@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 7a6dfb335b01..3dd289ddb1b3 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3407,6 +3407,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);
}
commit ae587c8f2892314da6c97a2e85b97845ede9b0e6
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Apr 5 08:51:57 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Apr 5 12:59:17 2024 +0200
cid#1596116 Uninitialized scalar field
Change-Id: I6a4803ae079786880b5a8ff040f1215657604476
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165810
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/cui/source/inc/whatsnew.hxx b/cui/source/inc/whatsnew.hxx
index 76a3a2d4d63d..979fff919df2 100644
--- a/cui/source/inc/whatsnew.hxx
+++ b/cui/source/inc/whatsnew.hxx
@@ -20,14 +20,14 @@ class WhatsNewImg : public weld::CustomWidgetController
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&) override;
public:
- WhatsNewImg(){};
+ WhatsNewImg() {}
void Update(const OUString& sImage, const OUString& sText)
{
m_sImage = sImage;
m_sText = sText;
SetAccessibleName(m_sText);
Invalidate();
- };
+ }
};
class WhatsNewProgress : public weld::CustomWidgetController
@@ -37,13 +37,17 @@ class WhatsNewProgress : public weld::CustomWidgetController
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&) override;
public:
- WhatsNewProgress(){};
+ WhatsNewProgress()
+ : m_nTotal(0)
+ , m_nCurrent(0)
+ {
+ }
void Update(const sal_Int32 nCurrent, const sal_Int32 nTotal)
{
m_nTotal = nTotal;
m_nCurrent = nCurrent;
Invalidate();
- };
+ }
};
class WhatsNewDialog : public weld::GenericDialogController
