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

[Stephan Bergmann]

 compilerplugins/clang/constantfunction.cxx |    6 ++++--
 vcl/unx/gtk/window/gtksalframe.cxx         |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ca39d8fe038af6a07189838652713fc5a6296f7d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 26 10:53:57 2015 +0100

    loplugin:cstylecast
    
    Change-Id: Ia04113c52787aa7498ba11864313a39caa1c1d22

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 0c5ff07..36a780b 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -993,7 +993,7 @@ void GtkSalFrame::InitCommon()
     GtkGesture *pSwipe = gtk_gesture_swipe_new(m_pWindow);
     g_signal_connect(pSwipe, "swipe", G_CALLBACK(gestureSwipe), this);
     gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER (pSwipe), GTK_PHASE_TARGET);
-    g_object_weak_ref(G_OBJECT(m_pWindow), (GWeakNotify)g_object_unref, pSwipe);
+    g_object_weak_ref(G_OBJECT(m_pWindow), reinterpret_cast<GWeakNotify>(g_object_unref), pSwipe);
 #endif
 
 #else
commit 1f1ce7e01ad7470de475f346e939757dbb1151f7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 26 10:52:35 2015 +0100

    loplugin:constantfunction: vcl/unx/gtk3
    
    Change-Id: I66ffc0c3a73d45e9d4b54f46092a65913b753d26

diff --git a/compilerplugins/clang/constantfunction.cxx b/compilerplugins/clang/constantfunction.cxx
index 4ca710f..4f367fc 100644
--- a/compilerplugins/clang/constantfunction.cxx
+++ b/compilerplugins/clang/constantfunction.cxx
@@ -405,8 +405,10 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
         return true;
     }
     // vcl/unx/gtk3 re-using vcl/unx/gtk:
-    if (aFunctionName == "GtkData::initNWF"
-        || aFunctionName == "GtkSalFrame::EnsureAppMenuWatch")
+    if (aFunctionName == "DeInitAtkBridge"
+        || aFunctionName == "GtkData::initNWF"
+        || aFunctionName == "GtkSalFrame::EnsureAppMenuWatch"
+        || aFunctionName == "InitAtkBridge")
     {
         return true;
     }