[Libreoffice-commits] core.git: libreofficekit/source

[Stephan Bergmann]

 libreofficekit/source/gtk/lokdocview.cxx |   59 ++++++++++++++++---------------
 1 file changed, 31 insertions(+), 28 deletions(-)

New commits:
commit 626b1e9177eed280a71ca9a009bc76a4c3476364
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 18 09:33:53 2015 +0200

    loplugin:staticmethods
    
    Change-Id: I660d68b9b596be531d595c35666a33fb02d6fd6a

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 4fffaf3..f7f040a 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -183,8 +183,6 @@ struct LOKDocView_Impl
     static gboolean globalCallback(gpointer pData);
     /// Implementation of the callback handler, invoked by callback();
     gboolean callbackImpl(CallbackData* pCallbackData);
-    /// Implementation of the global callback handler, invoked by globalCallback();
-    gboolean globalCallbackImpl(CallbackData* pCallbackData);
     /// Our LOK callback, runs on the LO thread.
     static void callbackWorker(int nType, const char* pPayload, void* pData);
     /// Implementation of the callback worder handler, invoked by callbackWorker().
@@ -197,6 +195,36 @@ struct LOKDocView_Impl
     void commandChanged(const std::string& rPayload);
 };
 
+namespace {
+
+/// Implementation of the global callback handler, invoked by globalCallback();
+gboolean globalCallbackImpl(LOKDocView_Impl::CallbackData* pCallback)
+{
+    switch (pCallback->m_nType)
+    {
+    case LOK_CALLBACK_STATUS_INDICATOR_START:
+    {
+    }
+    break;
+    case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:
+    {
+    }
+    break;
+    case LOK_CALLBACK_STATUS_INDICATOR_FINISH:
+    {
+    }
+    break;
+    default:
+        g_assert(false);
+        break;
+    }
+    delete pCallback;
+
+    return G_SOURCE_REMOVE;
+}
+
+}
+
 LOKDocView_Impl::CallbackData::CallbackData(int nType, const std::string& rPayload, LOKDocView* pDocView)
     : m_nType(nType),
     m_aPayload(rPayload),
@@ -899,7 +927,7 @@ gboolean LOKDocView_Impl::callback(gpointer pData)
 gboolean LOKDocView_Impl::globalCallback(gpointer pData)
 {
     LOKDocView_Impl::CallbackData* pCallback = static_cast<LOKDocView_Impl::CallbackData*>(pData);
-    return pCallback->m_pDocView->m_pImpl->globalCallbackImpl(pCallback);
+    return globalCallbackImpl(pCallback);
 }
 
 gboolean LOKDocView_Impl::callbackImpl(CallbackData* pCallback)
@@ -987,31 +1015,6 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* pCallback)
     return G_SOURCE_REMOVE;
 }
 
-gboolean LOKDocView_Impl::globalCallbackImpl(CallbackData* pCallback)
-{
-    switch (pCallback->m_nType)
-    {
-    case LOK_CALLBACK_STATUS_INDICATOR_START:
-    {
-    }
-    break;
-    case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:
-    {
-    }
-    break;
-    case LOK_CALLBACK_STATUS_INDICATOR_FINISH:
-    {
-    }
-    break;
-    default:
-        g_assert(false);
-        break;
-    }
-    delete pCallback;
-
-    return G_SOURCE_REMOVE;
-}
-
 void LOKDocView_Impl::callbackWorker(int nType, const char* pPayload, void* pData)
 {
     LOKDocView* pDocView = static_cast<LOKDocView*>(pData);