diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-02 22:02:19 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:35:14 +0100 |
commit | 954e5e4b7820c5db3a6720dc9dc27e49cee449ac (patch) | |
tree | a5136c84a45d3861f7271b9eced37e33aa274658 /svx/source | |
parent | e8284454f517d29a29f95a347a38730ded047f41 (diff) |
prophylactic double dispose audit.
Change-Id: Ia18c0b7a76fb0894efe33afaf69a0079c4583228
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/docrecovery.cxx | 1 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 9542c99fcba4..f704de3a0cd1 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -909,6 +909,7 @@ RecoveryDialog::~RecoveryDialog() void RecoveryDialog::dispose() { delete m_pFileListLB; + m_pFileListLB = NULL; Dialog::dispose(); } diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 860c6ac49f84..e1ed4afcb96e 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -141,7 +141,7 @@ void FmGridHeader::dispose() { delete m_pImpl; m_pImpl = NULL; - FmGridHeader::dispose(); + svt::EditBrowserHeader::dispose(); } sal_uInt16 FmGridHeader::GetModelColumnPos(sal_uInt16 nId) const diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index a60522a62698..89caf2621282 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -956,9 +956,10 @@ DbGridControl::~DbGridControl() void DbGridControl::dispose() { - RemoveColumns(); - + if (!IsDisposed()) { + RemoveColumns(); + m_bWantDestruction = true; osl::MutexGuard aGuard(m_aDestructionSafety); if (m_pFieldListeners) @@ -984,7 +985,9 @@ void DbGridControl::dispose() m_xRowSetListener.clear(); delete m_pDataCursor; + m_pDataCursor = NULL; delete m_pSeekCursor; + m_pSeekCursor = NULL; m_aBar.disposeAndClear(); |