|
 |
f325b2 |
From c97dc2f0e98daf6d732aadb983e36cd1d2637ffd Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Fri, 18 Sep 2015 11:14:58 +0200
|
|
|
f325b2 |
Subject: [PATCH 153/398] gtktiledviewer: fix leftover import progressbar in
|
|
|
f325b2 |
createView()
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ia71e80c521cdc6a8e4df52e51e063a44a0dd53df
|
|
|
f325b2 |
(cherry picked from commit af29b2b57cc07490cc36ff02d5ff3f3844e7c102)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 9 ++++++---
|
|
|
f325b2 |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
index 8e64972be17d..46264eb0126b 100644
|
|
|
f325b2 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
@@ -194,12 +194,13 @@ static void toggleFindbar(GtkWidget* pButton, gpointer /*pItem*/)
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
/// Common initialization, regardless if it's just a new view or a full init.
|
|
|
f325b2 |
-static void setupWidgetAndCreateWindow(GtkWidget* pDocView)
|
|
|
f325b2 |
+static TiledWindow& setupWidgetAndCreateWindow(GtkWidget* pDocView)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
setupDocView(pDocView);
|
|
|
f325b2 |
TiledWindow aWindow;
|
|
|
f325b2 |
aWindow.m_pDocView = pDocView;
|
|
|
f325b2 |
- createWindow(aWindow);
|
|
|
f325b2 |
+ GtkWidget* pWindow = createWindow(aWindow);
|
|
|
f325b2 |
+ return lcl_getTiledWindow(pWindow);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
/// Creates a new view, i.e. no LOK init or document load.
|
|
|
f325b2 |
@@ -208,7 +209,9 @@ static void createView(GtkWidget* pButton, gpointer /*pItem*/)
|
|
|
f325b2 |
TiledWindow& rWindow = lcl_getTiledWindow(pButton);
|
|
|
f325b2 |
GtkWidget* pDocView = lok_doc_view_new_from_widget(LOK_DOC_VIEW(rWindow.m_pDocView));
|
|
|
f325b2 |
|
|
|
f325b2 |
- setupWidgetAndCreateWindow(pDocView);
|
|
|
f325b2 |
+ TiledWindow& rNewWindow = setupWidgetAndCreateWindow(pDocView);
|
|
|
f325b2 |
+ // Hide status bar that contains the unused progress bar.
|
|
|
f325b2 |
+ gtk_widget_hide(rNewWindow.m_pStatusBar);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
/// Creates a new model, i.e. LOK init and document load, one view implicitly.
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|