872cf486c5
This reverts the following commits:
commit 722f4e1d86
tdf#104573 - Assertion failed: SolarMutex not locked
commit f04ec99f5e
tdf#104573 - Assertion failed: SolarMutex not locked
commit 71b1e3ff63
tdf#104573 - Assertion failed: SolarMutex not locked when trying
commit e794ce1eef
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>
63 lines
1.9 KiB
Makefile
63 lines
1.9 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_Library_Library,pdfimport))
|
|
|
|
$(eval $(call gb_Library_set_componentfile,pdfimport,sdext/source/pdfimport/pdfimport))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,pdfimport))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,pdfimport,sdext/pdfimport))
|
|
|
|
$(eval $(call gb_Library_set_include,pdfimport,\
|
|
-I$(SRCDIR)/sdext/source/pdfimport/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_libraries,pdfimport,\
|
|
basegfx \
|
|
comphelper \
|
|
vcl \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,pdfimport,\
|
|
boost_headers \
|
|
zlib \
|
|
$(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,pdfimport, \
|
|
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,pdfimport,\
|
|
sdext/source/pdfimport/filterdet \
|
|
sdext/source/pdfimport/misc/pdfihelper \
|
|
sdext/source/pdfimport/misc/pwdinteract \
|
|
sdext/source/pdfimport/odf/odfemitter \
|
|
sdext/source/pdfimport/pdfiadaptor \
|
|
sdext/source/pdfimport/pdfparse/pdfentries \
|
|
sdext/source/pdfimport/pdfparse/pdfparse \
|
|
sdext/source/pdfimport/sax/emitcontext \
|
|
sdext/source/pdfimport/sax/saxattrlist \
|
|
sdext/source/pdfimport/services \
|
|
sdext/source/pdfimport/tree/drawtreevisiting \
|
|
sdext/source/pdfimport/tree/genericelements \
|
|
sdext/source/pdfimport/tree/imagecontainer \
|
|
sdext/source/pdfimport/tree/pdfiprocessor \
|
|
sdext/source/pdfimport/tree/style \
|
|
sdext/source/pdfimport/tree/treevisitorfactory \
|
|
sdext/source/pdfimport/tree/writertreevisiting \
|
|
sdext/source/pdfimport/wrapper/wrapper \
|
|
))
|
|
|
|
# vim:set noet sw=4 ts=4:
|