diff options
| -rw-r--r-- | comphelper/source/misc/proxyaggregation.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 1 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/SectionWindow.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/uno/treecontrolpeer.cxx | 1 | ||||
| -rw-r--r-- | svx/source/form/fmscriptingenv.cxx | 1 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbtablepreviewdialog.cxx | 1 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 1 |
10 files changed, 12 insertions, 0 deletions
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index 13d59edfe679..5efb0f211f76 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -172,6 +172,7 @@ namespace comphelper { m_xInner->removeEventListener( this ); m_xInner->dispose(); + m_xInner.clear(); } } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 9b36567c2d9c..6f050db476d8 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -226,6 +226,7 @@ void OAppDetailPageHelper::dispose() Reference< ::util::XCloseable> xCloseable(m_xFrame,UNO_QUERY); if ( xCloseable.is() ) xCloseable->close(true); + m_xFrame.clear(); } catch(const Exception&) { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 059f9ac5542f..ad891571fd46 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -694,6 +694,7 @@ void SbaGridControl::dispose() { if (m_nAsyncDropEvent) Application::RemoveUserEvent(m_nAsyncDropEvent); + m_nAsyncDropEvent = nullptr; FmGridControl::dispose(); } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 20cb5428e5c4..880a68f7b59c 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -118,9 +118,11 @@ void OReportSection::dispose() m_pPage = nullptr; if ( m_pMulti.is() ) m_pMulti->dispose(); + m_pMulti.clear(); if ( m_pReportListener.is() ) m_pReportListener->dispose(); + m_pReportListener.clear(); m_pFunc.reset(); { diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 3cc789fea738..cc16aedf9d59 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -108,8 +108,10 @@ void OSectionWindow::dispose() { if ( m_pSectionMulti.is() ) m_pSectionMulti->dispose(); + m_pSectionMulti.clear(); if ( m_pGroupMulti.is() ) m_pGroupMulti->dispose(); + m_pGroupMulti.clear(); } catch (uno::Exception&) { diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 195b4506bd54..4c64b59e1c50 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -124,6 +124,7 @@ void SmGraphicWindow::dispose() { if (mxAccessible.is()) mxAccessible->ClearWin(); // make Accessible nonfunctional + mxAccessible.clear(); CaretBlinkStop(); ScrollableWindow::dispose(); } diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 974ee8edabab..65b7b7994b32 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -1423,6 +1423,7 @@ void UnoTreeListBoxImpl::dispose() { if( mxPeer.is() ) mxPeer->disposeControl(); + mxPeer.clear(); SvTreeListBox::dispose(); } diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 27260c0381ea..2f123a881f18 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -1069,6 +1069,7 @@ namespace svxform ::osl::MutexGuard aGuard( m_aMutex ); m_bDisposed = true; m_pScriptListener->dispose(); + m_pScriptListener.clear(); } diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index 42f07505fe37..27110367df53 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -87,6 +87,7 @@ void SwDBTablePreviewDialog::dispose() { m_xFrame->setComponent(nullptr, nullptr); m_xFrame->dispose(); + m_xFrame.clear(); } m_pDescriptionFI.clear(); m_pBeamerWIN.clear(); diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index b80db98d9554..57052d55433c 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -205,6 +205,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId() void SAL_CALL Storage::dispose() { m_xWrappedStorage->dispose(); + m_xWrappedStorage.clear(); } |