Blob Blame History Raw
From 9d844459f8aed0ef85a7985f48a2460f9d594a59 Mon Sep 17 00:00:00 2001
From: Pranav Kant <pranavk@libreoffice.org>
Date: Tue, 15 Dec 2015 00:23:46 +0530
Subject: [PATCH 374/398] lokdocview: Superfluous *_set_zoom() call on widget
 initialization

G_PARAM_CONSTRUCT implies that parameter will be set upon widget
initialization which means calling lok_doc_view_set_zoom() while
document still points to null.

Change-Id: Ib576ac3b32c2349be2b2df6067ae79a056a03028
Reviewed-on: https://gerrit.libreoffice.org/20775
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit a2682e4b081a9a8c6814db768e4ee9e5390907ae)
Reviewed-on: https://gerrit.libreoffice.org/21264
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Pranav Kant <pranavk@gnome.org>
(cherry picked from commit 0478825ba51d390486bfbecb410bf9aaa3a3ff59)
---
 libreofficekit/source/gtk/lokdocview.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index a3e6b21165d9..ccc45657626b 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -760,6 +760,7 @@ static gboolean postDocumentLoad(gpointer pData)
                                 nDocumentHeightPixels);
     gtk_widget_set_can_focus(GTK_WIDGET(pLOKDocView), TRUE);
     gtk_widget_grab_focus(GTK_WIDGET(pLOKDocView));
+    lok_doc_view_set_zoom(pLOKDocView, 1.0);
 
     return G_SOURCE_REMOVE;
 }
@@ -2141,7 +2142,6 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
                              "The current zoom level of the content",
                              0, 5.0, 1.0,
                              static_cast<GParamFlags>(G_PARAM_READWRITE |
-                                                      G_PARAM_CONSTRUCT |
                                                       G_PARAM_STATIC_STRINGS)));
 
     /**
-- 
2.12.0