reportdesign/source/ui/dlg/Condition.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ef663010434da24ecda35d0f0c26ce1a2b2c0f6c
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Oct 23 13:26:49 2016 +0200
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 <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/reportdesign/source/ui/dlg/Condition.cxx
b/reportdesign/source/ui/dlg/Condition.cxx
index 9907c4f..e1b5b05 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();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
