summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-08-19 12:38:35 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2022-08-19 21:47:44 +0200
commit6462bd8bca3d7c89e1dbf7c97ca6dc9056472992 (patch)
tree7dff31f5362df562ac9fb9d9a76055698e4295f1
parent3984aa54e43ce2cf342937b9afedbf1d5e79592c (diff)
tdf#150496 Revert "fix "invalid class cast from 'OOoAtkObj' to 'GtkWidgetAccessible'""
This reverts commit e3485e17b06400f5df63d21e00534a6f33b54a72. Change-Id: I785c9d2129078a38b718b7a150a14bc2e56ff479 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138433 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r--vcl/unx/gtk3/a11y/atkwrapper.cxx2
-rw-r--r--vcl/unx/gtk3/a11y/atkwrapper.hxx3
2 files changed, 2 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index f95d3efe78c1..d23f384e26fc 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx
@@ -705,7 +705,7 @@ atk_object_wrapper_get_type()
reinterpret_cast<GInstanceInitFunc>(atk_object_wrapper_init),
nullptr
} ;
- type = g_type_register_static (GTK_TYPE_WIDGET_ACCESSIBLE,
+ type = g_type_register_static (ATK_TYPE_OBJECT,
"OOoAtkObj",
&typeInfo, GTypeFlags(0)) ;
}
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.hxx b/vcl/unx/gtk3/a11y/atkwrapper.hxx
index 6f18bde614ee..0b5f64726bba 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.hxx
@@ -47,8 +47,7 @@ namespace com::sun::star::accessibility {
struct AtkObjectWrapper
{
- GtkWidgetAccessible aParent;
-
+ AtkObject aParent;
AtkObject* mpOrig; //if we're a GtkDrawingArea acting as a custom LibreOffice widget, this is the toolkit default impl
AtkObject* mpSysObjChild; //if we're a container for a sysobj, then this is the sysobj native gtk AtkObject