summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2016-10-23 13:26:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-23 12:06:15 +0000
commitef663010434da24ecda35d0f0c26ce1a2b2c0f6c (patch)
treeb5afc7580d5a13533ab4b308dad6c58e6cb1e36c
parente518124cd6d1f001c1370bf1ae3bbf8c3f653cc5 (diff)
Related tdf#103421: disposeAndClear m_aColorSet (reportdesign)
m_aColorSet has been declared as VclPtr<ValueSet> then initialized with VclPtr<ValueSet>::Create(this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT)) Following vcl/README.lifecycle, we're on the case 2 of "Who owns & disposes what ?" so we should use disposeAndClear Change-Id: I5809b54b8a15c365362c05c35a7499d8f4f69ed2 Reviewed-on: https://gerrit.libreoffice.org/30176 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 9907c4f6342f..e1b5b0512e0e 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -160,7 +160,7 @@ OColorPopup::~OColorPopup()
void OColorPopup::dispose()
{
disposeBuilder();
- m_aColorSet.clear();
+ m_aColorSet.disposeAndClear();
m_pCondition.clear();
FloatingWindow::dispose();
}