872cf486c5
This reverts the following commits:
commit 722f4e1d86710f2facd37d7e040df9e1fd585e26
tdf#104573 - Assertion failed: SolarMutex not locked
commit f04ec99f5e6a543b8191ced61db4710c3c0de356
tdf#104573 - Assertion failed: SolarMutex not locked
commit 71b1e3ff6374c23e65200d3bcafca387d29af04f
tdf#104573 - Assertion failed: SolarMutex not locked when trying
commit e794ce1eef6730e5a46d5fb0aa6db2895ede85e7
verify that we hold the SolarMutex when ref-counting VclPtr
IRC discussion:
<noelgrandin> sberg, maybe I should revert this whole "VclPtr assert" series, I don't have mental bandwidth to sort this out properly now
<sberg> noelgrandin, what I fear is that you'll end up adding lots of SolarMutex locks to small places, where the proper fix would be to add it further out; and once such a dreaded recursive SolarMutex lock is in place (but needlessly so, once the proper fix is done), it's hard to clean that up again
<noelgrandin> sberg, yeah, in that case I'll just remove all of this, leave it for another day
Change-Id: Ie4f84b72b79a1b7e80164b5c7693af398c2c569a
Reviewed-on: https://gerrit.libreoffice.org/31946
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
58 lines
1.5 KiB
Makefile
58 lines
1.5 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,sdext_pdfimport))
|
|
|
|
$(eval $(call gb_CppunitTest_use_sdk_api,sdext_pdfimport))
|
|
|
|
$(eval $(call gb_CppunitTest_set_include,sdext_pdfimport,\
|
|
-I$(SRCDIR)/sdext/source/pdfimport/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_externals,sdext_pdfimport,\
|
|
boost_headers \
|
|
zlib \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\
|
|
basegfx \
|
|
vcl \
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
test \
|
|
unotest \
|
|
$(gb_UWINAPI) \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_library_objects,sdext_pdfimport,pdfimport))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\
|
|
sdext/source/pdfimport/test/tests \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_executable,sdext_pdfimport,xpdfimport))
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,sdext_pdfimport))
|
|
$(eval $(call gb_CppunitTest_use_vcl,sdext_pdfimport))
|
|
|
|
$(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\
|
|
comphelper/util/comphelp \
|
|
configmgr/source/configmgr \
|
|
i18npool/util/i18npool \
|
|
ucb/source/core/ucb1 \
|
|
ucb/source/ucp/file/ucpfile1 \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_configuration,sdext_pdfimport))
|
|
|
|
# vim:set noet sw=4 ts=4:
|