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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index b442a4cee603..f185a1ebb719 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -214,6 +214,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument bool m_bSuicide ; bool m_bExternalTitle ; bool m_bModifiedSinceLastSave ; + bool m_bDisposing ; Reference< view::XPrintable> m_xPrintable ; Reference< ui::XUIConfigurationManager2 > m_xUIConfigurationManager; ::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListen ; @@ -235,6 +236,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument , m_bSuicide ( false ) , m_bExternalTitle ( false ) , m_bModifiedSinceLastSave( false ) + , m_bDisposing ( false ) { // increase global instance counter. ++g_nInstanceCounter; @@ -726,6 +728,10 @@ void SAL_CALL SfxBaseModel::dispose() return; } + if ( m_pData->m_bDisposing ) + return; + m_pData->m_bDisposing = true; + if ( m_pData->m_pStorageModifyListen.is() ) { m_pData->m_pStorageModifyListen->dispose(); |