diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-24 15:58:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-25 13:56:27 +0100 |
| commit | c68c744b68fd50adb6ce725bf9de377a5f915dab (patch) | |
| tree | a672de5b952dd8982951c90d791075dd213fab77 /svx/source | |
| parent | f0c0c62c10e4ffdb9ce44202e2540d2f39a9fcb5 (diff) | |
pass unique_lock as param in WeakComponentImplHelperBase::disposing
so that subclasses can drop the lock while calling listeners
Change-Id: I6105438110af08f10b0ed50057b28172c3442b95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127434
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.hxx | 2 | ||||
| -rw-r--r-- | svx/source/table/tabledesign.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 080d2a204b9d..fa560abed6a0 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -690,7 +690,7 @@ void ChildrenManagerImpl::impl_dispose() } -void ChildrenManagerImpl::disposing() +void ChildrenManagerImpl::disposing(std::unique_lock<std::mutex>&) { impl_dispose(); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 6cd9a76305b5..f4105c878f47 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -315,7 +315,7 @@ private: /** This method is called from the component helper base class while disposing. */ - virtual void disposing() override; + virtual void disposing(std::unique_lock<std::mutex>&) override; void impl_dispose(); diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 1694f8b9338d..baf2ee21ab2c 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -391,7 +391,7 @@ void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& // XComponent -void SAL_CALL TableDesignStyle::disposing() +void TableDesignStyle::disposing() { for(Reference<XStyle> & rCellStyle : maCellStyles) rCellStyle.clear(); diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index a20db0d073d2..f78787d5b674 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -947,7 +947,7 @@ public: protected: // is called from WeakComponentImplHelper when XComponent::dispose() was // called from outside - virtual void disposing() override; + virtual void disposing(std::unique_lock<std::mutex>&) override; // ____ XInitialization ____ // one argument is allowed, which is the XStorage @@ -993,7 +993,7 @@ SvXMLGraphicImportExportHelper::SvXMLGraphicImportExportHelper( SvXMLGraphicHelp m_eGraphicHelperMode( eMode ) {} -void SvXMLGraphicImportExportHelper::disposing() +void SvXMLGraphicImportExportHelper::disposing(std::unique_lock<std::mutex>&) { Reference< XComponent > xComp( m_xGraphicObjectResolver, UNO_QUERY ); OSL_ASSERT( xComp.is()); |