From ef663010434da24ecda35d0f0c26ce1a2b2c0f6c Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Sun, 23 Oct 2016 13:26:49 +0200
Subject: 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>
---
 reportdesign/source/ui/dlg/Condition.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'reportdesign')

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();
 }
-- 
cgit