commit 6462bd8bca3d7c89e1dbf7c97ca6dc9056472992
author Caolán McNamara <caolanm@redhat.com> Fri Aug 19 12:38:35 2022 +0200
committer Michael Weghorn <m.weghorn@posteo.de> Fri Aug 19 21:47:44 2022 +0200
tree 7dff31f5362df562ac9fb9d9a76055698e4295f1
parent 3984aa54e43ce2cf342937b9afedbf1d5e79592c

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>

vcl/unx/gtk3/a11y/atkwrapper.cxx

diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index f95d3ef..d23f384 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)) ;
  }

vcl/unx/gtk3/a11y/atkwrapper.hxx

diff --git a/vcl/unx/gtk3/a11y/atkwrapper.hxx b/vcl/unx/gtk3/a11y/atkwrapper.hxx
index 6f18bde..0b5f647 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