|
 |
f325b2 |
From aa50f4ae737bd4428c8a104447dd0b3519a733a9 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 15 Sep 2015 15:22:53 +0200
|
|
|
f325b2 |
Subject: [PATCH 135/398] gtktiledviewer: set up a new GtkWindow for a new view
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I9dcb5871c231a49bcd65a1187df6c3c81f92bd55
|
|
|
f325b2 |
(cherry picked from commit c1d72145314be0e53d5f93e3b639715c9fbba8b0)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 11 ++++++++---
|
|
|
f325b2 |
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
index 53bc5ea39615..e32397b133c9 100644
|
|
|
f325b2 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
@@ -77,6 +77,9 @@ public:
|
|
|
f325b2 |
|
|
|
f325b2 |
static std::map<GtkWidget*, TiledWindow> g_aWindows;
|
|
|
f325b2 |
|
|
|
f325b2 |
+static void setupDocView(GtkWidget* pDocView);
|
|
|
f325b2 |
+static GtkWidget* createWindow(TiledWindow& rWindow);
|
|
|
f325b2 |
+
|
|
|
f325b2 |
static TiledWindow& lcl_getTiledWindow(GtkWidget* pWidget)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
GtkWidget* pToplevel = gtk_widget_get_toplevel(pWidget);
|
|
|
f325b2 |
@@ -193,9 +196,11 @@ static void toggleFindbar(GtkWidget* pButton, gpointer /*pItem*/)
|
|
|
f325b2 |
static void createView(GtkWidget* pButton, gpointer /*pItem*/)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
TiledWindow& rWindow = lcl_getTiledWindow(pButton);
|
|
|
f325b2 |
- LOKDocView* pLOKDocView = LOK_DOC_VIEW(rWindow.m_pDocView);
|
|
|
f325b2 |
- LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(pLOKDocView);
|
|
|
f325b2 |
- pDocument->pClass->createView(pDocument);
|
|
|
f325b2 |
+ GtkWidget* pDocView = lok_doc_view_new_from_widget(LOK_DOC_VIEW(rWindow.m_pDocView));
|
|
|
f325b2 |
+ setupDocView(pDocView);
|
|
|
f325b2 |
+ TiledWindow aWindow;
|
|
|
f325b2 |
+ aWindow.m_pDocView = pDocView;
|
|
|
f325b2 |
+ createWindow(aWindow);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
/// Our GtkClipboardGetFunc implementation for HTML.
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|