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