libreofficekit/source/gtk/lokdocview.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 81f0c285deb50fcec729168c8736729590c07fa7
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Mon Mar 16 12:45:21 2015 +0100

    lok_docview_init: ignore the second, not the first param
    
    Fixes the crash on startup.
    
    Change-Id: I991537644dfb6a5335d08d3d03c3d25491a0c335

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index c0f2130..668d6de 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -337,9 +337,9 @@ static void lok_docview_class_init( gpointer ptr )
                      G_TYPE_BOOLEAN);
 }
 
-static void lok_docview_init( GTypeInstance *, gpointer ptr )
+static void lok_docview_init( GTypeInstance* pInstance, gpointer )
 {
-    LOKDocView* pDocView = static_cast<LOKDocView *>(ptr);
+    LOKDocView* pDocView = reinterpret_cast<LOKDocView *>(pInstance);
     // Gtk ScrolledWindow is apparently not fully initialised yet, we 
specifically
     // have to set the [hv]adjustment to prevent GTK assertions from firing, 
see
     // https://bugzilla.gnome.org/show_bug.cgi?id=438114 for more info.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to