[Libreoffice-commits] core.git: vcl/unx

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Jan 20 10:39:15 UTC 2019


 vcl/unx/gtk/a11y/atklistener.cxx |    4 ++--
 vcl/unx/gtk/a11y/atkutil.cxx     |    4 ++--
 vcl/unx/gtk/a11y/atkwindow.cxx   |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 95ae9eceb944ec71b4f99b4446d517b4cb9fd6c4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jan 18 19:40:59 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jan 20 11:38:54 2019 +0100

    GSourceFunc return gboolean
    
    Change-Id: I9872b27450e9b50d8bef33abc267a763d7d516cb
    Reviewed-on: https://gerrit.libreoffice.org/66632
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index 61df38a27beb..737a24b2312e 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -76,7 +76,7 @@ static AtkStateType mapState( const uno::Any &rAny )
 extern "C" {
     // rhbz#1001768 - down to horrific problems releasing the solar mutex
     // while destroying a Window - which occurs inside these notifications.
-    static gint
+    static gboolean
     idle_defunc_state_change( AtkObject *atk_obj )
     {
         SolarMutexGuard aGuard;
@@ -90,7 +90,7 @@ extern "C" {
             SAL_WNODEPRECATED_DECLARATIONS_POP
         }
         g_object_unref( G_OBJECT( atk_obj ) );
-        return FALSE;
+        return false;
     }
 }
 
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index a2c185f674c8..8aa3c0d80770 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -66,7 +66,7 @@ static guint focus_notify_handler = 0;
 
 extern "C" {
 
-static gint
+static gboolean
 atk_wrapper_focus_idle_handler (gpointer data)
 {
     SolarMutexGuard aGuard;
@@ -115,7 +115,7 @@ atk_wrapper_focus_idle_handler (gpointer data)
         }
     }
 
-    return FALSE;
+    return false;
 }
 
 } // extern "C"
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 31cbf83fd429..eb72edf4908c 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -122,14 +122,14 @@ init_from_window( AtkObject *accessible, vcl::Window const *pWindow )
 
 /*****************************************************************************/
 
-static gint
+static gboolean
 ooo_window_wrapper_clear_focus(gpointer)
 {
     SolarMutexGuard aGuard;
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     atk_focus_tracker_notify( nullptr );
     SAL_WNODEPRECATED_DECLARATIONS_POP
-    return FALSE;
+    return false;
 }
 
 /*****************************************************************************/
@@ -138,7 +138,7 @@ static gboolean
 ooo_window_wrapper_real_focus_gtk (GtkWidget *, GdkEventFocus *)
 {
     g_idle_add( ooo_window_wrapper_clear_focus, nullptr );
-    return FALSE;
+    return false;
 }
 
 static gboolean ooo_tooltip_map( GtkWidget* pToolTip, gpointer )


More information about the Libreoffice-commits mailing list