|
 |
f325b2 |
From d439c2271500a145d4c6e37e3a8d504cc2027b5f Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 15 Sep 2015 15:41:46 +0200
|
|
|
f325b2 |
Subject: [PATCH 137/398] lokdocview: set up the widget in all windows
|
|
|
f325b2 |
|
|
|
f325b2 |
With this finally the number of GTK+ windows always match the number
|
|
|
f325b2 |
returned by SfxLokHelper::getViews().
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ia45bef7dea86b80cfac00e2ad7c1a16d7f5b507b
|
|
|
f325b2 |
(cherry picked from commit b3498e9fcdc895853564d13173075bebc7407ef2)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 11 +++++++++--
|
|
|
f325b2 |
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 0b0b5e9d9659..92095f2d9707 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -1850,8 +1850,15 @@ lok_doc_view_new (const gchar* pPath, GCancellable *cancellable, GError **error)
|
|
|
f325b2 |
SAL_DLLPUBLIC_EXPORT GtkWidget* lok_doc_view_new_from_widget(LOKDocView* pLOKDocView)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LOKDocViewPrivate* priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private(pLOKDocView));
|
|
|
f325b2 |
- return GTK_WIDGET(g_initable_new(LOK_TYPE_DOC_VIEW, /*cancellable=*/0, /*error=*/0,
|
|
|
f325b2 |
- "lopath", priv->m_aLOPath, "lopointer", priv->m_pOffice, "docpointer", priv->m_pDocument, NULL));
|
|
|
f325b2 |
+ GtkWidget* pDocView = GTK_WIDGET(g_initable_new(LOK_TYPE_DOC_VIEW, /*cancellable=*/0, /*error=*/0,
|
|
|
f325b2 |
+ "lopath", priv->m_aLOPath, "lopointer", priv->m_pOffice, "docpointer", priv->m_pDocument, NULL));
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ // No documentLoad(), just a createView().
|
|
|
f325b2 |
+ LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(LOK_DOC_VIEW(pDocView));
|
|
|
f325b2 |
+ pDocument->pClass->createView(pDocument);
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ postDocumentLoad(pDocView);
|
|
|
f325b2 |
+ return pDocView;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|