summaryrefslogtreecommitdiff
path: root/sc/source/ui/miscdlgs/conflictsdlg.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-16 12:17:44 +0200
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 11:20:46 +0100
commitc72fac269626cd4c2c3f62a6eed69e47b59256a4 (patch)
treed36dd1a09731cb07254ae4a09036b2d64a59de44 /sc/source/ui/miscdlgs/conflictsdlg.cxx
parentde6b9148eb64dfa4b31c87c1ac46fda0821645e3 (diff)
vclwidget: convert lots more sites to use VclPtr
seems there was a lot of shared_ptr usage floating around... Change-Id: Icd05243170eb8493709275fc36bf986fc194b781
Diffstat (limited to 'sc/source/ui/miscdlgs/conflictsdlg.cxx')
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index d75dea976e84..03e269b856c0 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -448,6 +448,7 @@ ScConflictsDlg::~ScConflictsDlg()
void ScConflictsDlg::dispose()
{
m_pLbConflictsContainer.clear();
+ m_pLbConflicts.disposeAndClear();
m_pBtnKeepMine.clear();
m_pBtnKeepOther.clear();
m_pBtnKeepAllMine.clear();