mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related tdf#103421: disposeAndClear m_aColorSet (reportdesign)

Browse Source 
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>
This commit is contained in:
Julien Nabet
2016-10-23 13:26:49 +02:00
committed by Noel Grandin
parent e518124cd6
commit ef66301043
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
reportdesign/source/ui/dlg/Condition.cxx
View File

@@ -160,7 +160,7 @@ OColorPopup::~OColorPopup()
void OColorPopup::dispose() void OColorPopup::dispose()
{ {
disposeBuilder(); disposeBuilder();
m_aColorSet.clear(); m_aColorSet.disposeAndClear();
m_pCondition.clear(); m_pCondition.clear();
FloatingWindow::dispose(); FloatingWindow::dispose();
} }