Kaydet (Commit) e5cd9ee7 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

Revert "Implement lokconf_init."

This reverts commit 5acadbfb.

Conflicts:
	libreofficekit/qa/lokconf_init/lokconf_init.cxx

Change-Id: I88221f660bcf15cbc29e90bfc3016b367570f9af
üst 5ea8f923
# -*- 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,lokconf_init))
$(eval $(call gb_Executable_set_include,lokconf_init,\
$$(INCLUDE) \
))
$(eval $(call gb_Executable_use_libraries,lokconf_init, \
cppu \
sal \
))
$(eval $(call gb_Executable_use_static_libraries,lokconf_init,\
libreofficekit \
))
$(eval $(call gb_Executable_add_libs,lokconf_init,\
-lSM \
-lICE \
))
ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_libs,lokconf_init,\
-lm \
-ldl \
-lpthread \
))
endif
$(eval $(call gb_Executable_add_exception_objects,lokconf_init,\
libreofficekit/qa/lokconf_init/lokconf_init \
))
# vim: set noet sw=4 ts=4:
......@@ -11,10 +11,6 @@ $(eval $(call gb_Module_Module,libreofficekit))
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_targets,libreofficekit,\
Executable_lokconf_init \
))
# $(eval $(call gb_Module_add_check_targets,libreofficekit,\
# CppunitTest_libreofficekit_tiledrendering \
# ))
......
/* -*- 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>
#include <string.h>
#include <sal/main.h>
#include <LibreOfficeKit/LibreOfficeKit.h>
#include <LibreOfficeKit/LibreOfficeKitInit.h>
using namespace std;
// Using SAL_IMPLEMENT_MAIN means that we can directly use the same
// arguments as would be provided to cppunittester, i.e. ensuring
// that we're operating with the correct directories etc.
SAL_IMPLEMENT_MAIN()
{
string sPath( getenv("INSTDIR") );
sPath += "/program";
LibreOfficeKit* pOffice = lok_init( sPath.c_str() );
// As this is the first init, pOffice should be NULL.
// However there's no reason we shouldn't be able to operate
// even if it isn't the first init.
if ( pOffice )
{
pOffice->pClass->destroy( pOffice );
pOffice = 0;
}
return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment