Kaydet (Commit) ef663010 authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Noel Grandin

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/30176Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst e518124c
...@@ -160,7 +160,7 @@ OColorPopup::~OColorPopup() ...@@ -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();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment