diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-10-23 13:26:49 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-10-26 21:37:04 +0000 |
| commit | a369b0a056ba121b00328a1dc74cd48d8735b361 (patch) | |
| tree | ab78fdddad5afc1b5088be2f512d8eb90c2e56b3 | |
| parent | f13e6133fe0127734fcd4c8be2b1a526e4749656 (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>
(cherry picked from commit ef663010434da24ecda35d0f0c26ce1a2b2c0f6c)
Reviewed-on: https://gerrit.libreoffice.org/30177
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 36cf30541c67..63ed9038f63a 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -161,7 +161,7 @@ OColorPopup::~OColorPopup() void OColorPopup::dispose() { disposeBuilder(); - m_aColorSet.clear(); + m_aColorSet.disposeAndClear(); m_pCondition.clear(); FloatingWindow::dispose(); } |