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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/a11y/atkfactory.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit efaf44a8d4dc41086ae24b847a86c7b0b66106d3
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Sep 1 12:07:01 2022 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Sep 7 08:19:26 2022 +0200

    tdf#150688 return atk_noop_object_wrapper_new() instead of null on failure
    
    Change-Id: I20fd190a36649193ee2a1e536f520344c5f6c89a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138993
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/vcl/unx/gtk3/a11y/atkfactory.cxx b/vcl/unx/gtk3/a11y/atkfactory.cxx
index f92f9a667c9f..2fc407b7bc06 100644
--- a/vcl/unx/gtk3/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk3/a11y/atkfactory.cxx
@@ -117,7 +117,7 @@ wrapper_factory_create_accessible( GObject *obj )
         return atk_noop_object_wrapper_new();
 
     GtkSalFrame* pFrame = GtkSalFrame::getFromWindow(pTopLevel);
-    g_return_val_if_fail( pFrame != nullptr, nullptr );
+    g_return_val_if_fail(pFrame != nullptr, atk_noop_object_wrapper_new());
 
     vcl::Window* pFrameWindow = pFrame->GetWindow();
     if( pFrameWindow )
@@ -145,7 +145,7 @@ wrapper_factory_create_accessible( GObject *obj )
         }
     }
 
-    return nullptr;
+    return atk_noop_object_wrapper_new();
 }
 
 AtkObject* ooo_fixed_get_accessible(GtkWidget *obj)