[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/a11y/atkwrapper.cxx |    2 +-
 vcl/unx/gtk3/a11y/atkwrapper.hxx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e3485e17b06400f5df63d21e00534a6f33b54a72
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 15 13:14:08 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Aug 17 10:11:51 2022 +0200

    fix "invalid class cast from 'OOoAtkObj' to 'GtkWidgetAccessible'"
    
    and similar
    
    Change-Id: I8a989465057a5b7810f6cedf370fc1cd77f5af0e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138282
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index d23f384e26fc..f95d3efe78c1 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 (ATK_TYPE_OBJECT,
+      type = g_type_register_static (GTK_TYPE_WIDGET_ACCESSIBLE,
                                      "OOoAtkObj",
                                      &typeInfo, GTypeFlags(0)) ;
   }
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.hxx b/vcl/unx/gtk3/a11y/atkwrapper.hxx
index 0b5f64726bba..6f18bde614ee 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.hxx
@@ -47,7 +47,8 @@ namespace com::sun::star::accessibility {
 
 struct AtkObjectWrapper
 {
-    AtkObject aParent;
+    GtkWidgetAccessible 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