diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-27 10:27:46 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-29 13:44:02 +0200 |
commit | 8611f6e259b807b4f19c8dc0eab86ca648891ce3 (patch) | |
tree | fa2b0e463aafb51df754768f916ca9104969a557 /include/svx/measctrl.hxx | |
parent | 25a997c15d39fb30676a375df8ea4ce1ed2e1acd (diff) |
ref-count SdrObject
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>
Diffstat (limited to 'include/svx/measctrl.hxx')
-rw-r--r-- | include/svx/measctrl.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index ccdcab46f5fd..a6f25718596b 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SvxXMeasurePreview final : public weld::CustomWidgetControll private: MapMode m_aMapMode; std::unique_ptr<SdrModel> pModel; - std::unique_ptr<SdrMeasureObj, SdrObjectFreeOp> pMeasureObj; + rtl::Reference<SdrMeasureObj> pMeasureObj; void ResizeImpl(const Size& rSize); |