8611f6e259
Which means we can get rid of the majestic hack of ScCaptionPtr Previously, SdrObject was manually managed, and the ownership passed around in very complicated fashion. Notes: (*) SvxShape has a strong reference to SdrObject, where previously it had a weak reference. It is now strong since otherwise the SdrObject will go away very eagerly. (*) SdrObject still has a weak reference to SvxShape (*) In the existing places that an SdrObject is being deleted, we now just clear the reference (*) instead of SwVirtFlyDrawObj removing itself from the page that contains inside it's destructor, make the call site do the removing from the page. (*) Needed to take the SolarMutex in UndoManagerHelper_Impl::impl_clear because this can be called from UNO (e.g. sfx2_complex JUnit test) and the SdrObjects need the SolarMutex when destructing. (*) handle a tricky situation with SwDrawVirtObj in the SwDrawModel destructor because the existing code wants mpDrawObj in SwAnchoredObject to be sometimes owning, sometimes not, which results in a cycle with the new code. Change-Id: I4d79df1660e386388e5d51030653755bca02a163 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138837 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
56 lines
1.5 KiB
Makefile
56 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,sc_shapetest))
|
|
|
|
$(eval $(call gb_CppunitTest_use_external,sc_shapetest,boost_headers))
|
|
|
|
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_shapetest))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,sc_shapetest, \
|
|
sc/qa/unit/scshapetest \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,sc_shapetest, \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
sc \
|
|
sfx \
|
|
subsequenttest \
|
|
svl \
|
|
svx \
|
|
svxcore \
|
|
test \
|
|
tl \
|
|
unotest \
|
|
utl \
|
|
vcl \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_set_include,sc_shapetest,\
|
|
-I$(SRCDIR)/sc/source/ui/inc \
|
|
-I$(SRCDIR)/sc/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_sdk_api,sc_shapetest))
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,sc_shapetest))
|
|
$(eval $(call gb_CppunitTest_use_vcl,sc_shapetest))
|
|
|
|
$(eval $(call gb_CppunitTest_use_components,sc_shapetest,\
|
|
$(sc_unoapi_common_components) \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_configuration,sc_shapetest))
|
|
|
|
# vim: set noet sw=4 ts=4:
|