diff options
| author | Pranav Kant <pranavk@gnome.org> | 2015-06-10 16:10:19 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-12 15:20:52 +0200 |
| commit | 7a9dc7fd35168e1f44fb0aa23c984f90163db621 (patch) | |
| tree | 6ff0d49b81b9bfd6f9843caeba5012bfe7198c15 /libreofficekit/qa/gtktiledviewer | |
| parent | 97c9a87ac88b18e7bbb72ad218e5ed5cf4f4b2ed (diff) | |
lokdocview: Create LOK context inside of lok_doc_view_new
Change-Id: I675192d6bd6d10e6c7974a5de6f488f9a087ac32
Diffstat (limited to 'libreofficekit/qa/gtktiledviewer')
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index c8b47f7c7142..4f74583f52b3 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -19,7 +19,6 @@ #include <gtk/gtk.h> #include <LibreOfficeKit/LibreOfficeKitGtk.h> -#include <LibreOfficeKit/LibreOfficeKitInit.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #ifndef g_info @@ -53,8 +52,6 @@ GtkWidget* pFindbar; GtkWidget* pFindbarEntry; GtkWidget* pFindbarLabel; -static LibreOfficeKit* pOffice; - static void lcl_registerToolItem(GtkToolItem* pItem, const std::string& rName) { g_aToolItemCommandNames[pItem] = rName; @@ -361,10 +358,6 @@ int main( int argc, char* argv[] ) return 1; } - pOffice = lok_init( argv[1] ); - if ( pOffice == NULL ) - return 1; - gtk_init( &argc, &argv ); GtkWidget *pWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); @@ -469,7 +462,9 @@ int main( int argc, char* argv[] ) gtk_box_pack_end(GTK_BOX(pVBox), pFindbar, FALSE, FALSE, 0); // Docview - pDocView = lok_doc_view_new( pOffice ); + pDocView = lok_doc_view_new(argv[1]); + if (pDocView == NULL) + g_error ("Error while creating LOKDocView widget"); g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL); g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), NULL); g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), NULL); @@ -492,7 +487,7 @@ int main( int argc, char* argv[] ) int bOpened = lok_doc_view_open_document( LOK_DOC_VIEW(pDocView), argv[2] ); if (!bOpened) - g_error("main: lok_doc_view_open_document() failed with '%s'", pOffice->pClass->getError(pOffice)); + g_error("main: lok_doc_view_open_document() failed"); assert(lok_doc_view_get_document(LOK_DOC_VIEW(pDocView))); // GtkComboBox requires gtk 2.24 or later @@ -507,8 +502,6 @@ int main( int argc, char* argv[] ) gtk_main(); - pOffice->pClass->destroy( pOffice ); - return 0; } |