vcl/unx/gtk3/gtk3gtkframe.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 541c4c4509863beb7babe361b31e27f7295e3069 Author: Miklos Vajna <[email protected]> Date: Fri Feb 19 12:04:34 2016 +0100 vcl: loplugin:staticcall Change-Id: I2ad98616ff60ebb88f14675d94bd82e51d136c7f diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 0dd7db3..f16676c 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -613,7 +613,7 @@ gboolean ensure_dbus_setup( gpointer data ) g_object_set_data_full( G_OBJECT( gdkWindow ), "g-lo-menubar", pMenuModel, ObjectDestroyedNotify ); g_object_set_data_full( G_OBJECT( gdkWindow ), "g-lo-action-group", pActionGroup, ObjectDestroyedNotify ); - GdkDisplay *pDisplay = pSalFrame->getGdkDisplay(); + GdkDisplay *pDisplay = GtkSalFrame::getGdkDisplay(); // fdo#70885 we don't want app menu under Unity const bool bDesktopIsUnity = (SalGetDesktopEnvironment() == "UNITY"); #if defined(GDK_WINDOWING_X11) commit 8d41a41ce20193c94d7a54487976016c7ead7387 Author: Miklos Vajna <[email protected]> Date: Fri Feb 19 12:03:19 2016 +0100 vcl: loplugin:nullptr Change-Id: I08566926c931e1e9ef46e44ce265bde8148439f6 diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index ddfa0fc..0dd7db3 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -538,7 +538,7 @@ static void activate_uno(GSimpleAction *action, GVariant*, gpointer) return; gchar *strval = nullptr; - g_object_get(action, "name", &strval, NULL); + g_object_get(action, "name", &strval, nullptr); if (!strval) return; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
