diff options
author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-06-13 11:20:15 +0100 |
---|---|---|
committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-06-25 13:04:32 +0100 |
commit | 0cea87d60cfdc2bbc7c6b5d5ee9918e283fc7b2c (patch) | |
tree | 6aced406e9e2089a571598a7364453211a56c01f /desktop | |
parent | ff6a38b76df80d0f907f2f92cb851dea43c91d81 (diff) |
Move gtktiledviewer into libreofficekit.
desktop is no longer the right place for it now that
libreofficekit has its own directory.
Change-Id: I207f1d642e7e35c460ff85bb57aa142cb98023c8
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/Executable_gtktiledviewer.mk | 49 | ||||
-rw-r--r-- | desktop/Module_desktop.mk | 8 | ||||
-rw-r--r-- | desktop/qa/gtktiledviewer/gtktiledviewer.cxx | 64 |
3 files changed, 0 insertions, 121 deletions
diff --git a/desktop/Executable_gtktiledviewer.mk b/desktop/Executable_gtktiledviewer.mk deleted file mode 100644 index a0bf8ead8baa..000000000000 --- a/desktop/Executable_gtktiledviewer.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Executable_Executable,gtktiledviewer)) - -$(eval $(call gb_Executable_set_include,gtktiledviewer,\ - $$(INCLUDE) \ - -I$(SRCDIR)/desktop/inc \ -)) - -$(eval $(call gb_Executable_use_externals,gtktiledviewer,\ - gtk \ -)) - -$(eval $(call gb_Executable_use_libraries,gtktiledviewer,\ - libreofficekitgtk \ -)) - -$(eval $(call gb_Executable_use_static_libraries,gtktiledviewer,\ - libreofficekit \ -)) - -$(eval $(call gb_Executable_add_libs,gtktiledviewer,\ - -lX11 \ - -lXext \ - -lXrender \ - -lSM \ - -lICE \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_libs,gtktiledviewer,\ - -lm \ - -ldl \ - -lpthread \ -)) -endif - -$(eval $(call gb_Executable_add_exception_objects,gtktiledviewer,\ - desktop/qa/gtktiledviewer/gtktiledviewer \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 04b71f7578c6..cfaf0d93ecd9 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -29,14 +29,6 @@ $(eval $(call gb_Module_add_l10n_targets,desktop,\ UIConfig_deployment \ )) -ifeq ($(OS),LINUX) -ifneq ($(ENABLE_GTK),) -$(eval $(call gb_Module_add_targets,desktop,\ - Executable_gtktiledviewer \ -)) -endif -endif - ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,desktop,\ Executable_soffice_bin \ diff --git a/desktop/qa/gtktiledviewer/gtktiledviewer.cxx b/desktop/qa/gtktiledviewer/gtktiledviewer.cxx deleted file mode 100644 index 2c80a8d65014..000000000000 --- a/desktop/qa/gtktiledviewer/gtktiledviewer.cxx +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include <stdio.h> -#include <string.h> - -#include <gdk/gdk.h> -#include <gtk/gtk.h> - -#include <LibreOfficeKit/LibreOfficeKitGtk.h> - -static int help() -{ - fprintf( stderr, "Usage: gtktiledviewer <absolute-path-to-libreoffice-install> [path to document]\n" ); - return 1; -} - -int main( int argc, char* argv[] ) -{ - if( argc < 2 || - ( argc > 1 && ( !strcmp( argv[1], "--help" ) || !strcmp( argv[1], "-h" ) ) ) ) - return help(); - - if ( argv[1][0] != '/' ) - { - fprintf(stderr, "Absolute path required to libreoffice install\n"); - return 1; - } - - LibreOfficeKit* pOffice = lok_init( argv[1] ); - if( !pOffice ) - { - fprintf( stderr, "Failed to initialize\n" ); - return -1; - } - - ::lok::Document* pDocument = pOffice->documentLoad( argv[2] ); - - gtk_init( &argc, &argv ); - - GtkWidget *pWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_window_set_title( GTK_WINDOW(pWindow), "LibreOffice GTK Tiled Viewer" ); - gtk_window_set_default_size(GTK_WINDOW(pWindow), 800, 600); - g_signal_connect( pWindow, "destroy", G_CALLBACK(gtk_main_quit), NULL ); - - - GtkWidget* pDocView = lok_docview_new( pOffice ); - gtk_container_add( GTK_CONTAINER(pWindow), pDocView ); - - lok_docview_open_document( LOK_DOCVIEW(pDocView), argv[2] ); - - gtk_widget_show( pDocView ); - gtk_widget_show( pWindow ); - - gtk_main(); - - return 0; -}
\ No newline at end of file |