diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-18 11:14:58 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-21 07:30:26 +0200 |
commit | af29b2b57cc07490cc36ff02d5ff3f3844e7c102 (patch) | |
tree | 210f7932ad33426db01503eddf7bcc350477f312 /libreofficekit | |
parent | 43b2103f932c92374e2ba2ab0ec1006582a0f646 (diff) |
gtktiledviewer: fix leftover import progressbar in createView()
Change-Id: Ia71e80c521cdc6a8e4df52e51e063a44a0dd53df
Diffstat (limited to 'libreofficekit')
-rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index bb60ff165dcf..8686b000efb5 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. |