Stephan Bergmann
b475873cd0
...by simply making the two used functions OOX_DLLPUBLIC.
This solves an issue for mergelibs builds, where
09605513f4 "SmartArt: Progress in standard
FileFormat RoundTrip" had started to make this test fail with
> cppunittester: oox/source/drawingml/diagram/diagramhelper_oox.cxx:542: oox::drawingml::DiagramHelperFactory_oox::DiagramHelperFactory_oox(): Assertion `nullptr == pSingleGlobalDiagramHelperFactory_svx && "DiagramHelperFactory initialized multiple times (!)"' failed.
as that
> static DiagramHelperFactory_oox aSingleGlobalDiagramHelperFactory_oox;
in oox/source/drawingml/diagram/diagramhelper_oox.cxx was present twice now in
the process, in workdir/LinkTarget/CppunitTest/libtest_oox_tokenmap.so and in
instdir/program/libmergedlo.so.
Change-Id: I9c7ea35339a188c427a50e18d7eb7978e63e52fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200931
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com>
28 lines
737 B
Makefile
28 lines
737 B
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,oox_tokenmap))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,oox_tokenmap,\
|
|
oox/qa/token/tokenmap-test \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_custom_headers,oox_tokenmap,oox/generated))
|
|
|
|
$(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap))
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
|
|
cppu \
|
|
oox \
|
|
sal \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|