* As UCB is only ever initialized with "Local"/"Office", remove this configuration vector completely. The "create" ctor creates an instance internally initialized with those "Local"/"Office" keys. Special (test) code can still instantiate an uninitialized one via plain createInstance. And for backwards compatilibity process startup still ensures to create an initialized instance early, in case there is still code out there (in extensions) that later calls plain createInstance and expects to get the already-initialized (single) instance. * XInitialization is an "implementation detail" of the UniversalContentBroker service, do not expose in XUniversalContentBroker. * ucbhelper/configurationkeys.hxx is no longer needed and is removed. * ucbhelper/contentbroker.hxx is an empty wrapper and is removed; however, that requires ucbhelper::Content constructors to take explicit XComponentContext arguments now. * The only remaining code in ucbhelper/source/client/contentbroker.cxx is Android-only InitUCBHelper. Is that relevant still? Change-Id: I3f7bddd0456bffbcd13590c66d9011915c760f28
62 lines
1.4 KiB
Makefile
62 lines
1.4 KiB
Makefile
# -*- 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_CppunitTest_CppunitTest,basic_nested_struct))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,basic_nested_struct, \
|
|
basic/qa/cppunit/test_nested_struct \
|
|
))
|
|
|
|
# add a list of all needed libraries here
|
|
$(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
salhelper \
|
|
sb \
|
|
sot \
|
|
svl \
|
|
svt \
|
|
tl \
|
|
utl \
|
|
vcl \
|
|
xmlscript \
|
|
test \
|
|
$(gb_STDLIBS) \
|
|
))
|
|
|
|
ifeq ($(GUI),WNT)
|
|
$(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
|
|
oleaut32 \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_CppunitTest_set_include,basic_nested_struct,\
|
|
-I$(SRCDIR)/basic/source/inc \
|
|
-I$(SRCDIR)/basic/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_api,basic_nested_struct,\
|
|
offapi \
|
|
udkapi \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,basic_nested_struct))
|
|
|
|
$(eval $(call gb_CppunitTest_use_components,basic_nested_struct,\
|
|
configmgr/source/configmgr \
|
|
ucb/source/core/ucb1 \
|
|
ucb/source/ucp/file/ucpfile1 \
|
|
))
|
|
$(eval $(call gb_CppunitTest_use_configuration,basic_nested_struct))
|
|
|
|
# vim: set noet sw=4 ts=4:
|