commit 15178933b18bc3980890c1cd5a3f0e8ec3d5c744
author Michael Meeks <michael.meeks@collabora.com> Tue Mar 17 16:58:15 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 11:44:04 2015 +0100
tree 0dc3130b4ec491efa9236115ea8461871b7b433f
parent 462f0ede49cf96e3da1c7d30c39b33e383aa9451

fix ilistbox dispose.

Change-Id: Icc5b6e924dfeec7a7da4f654d79b17fe91ce1418

vcl/source/control/combobox.cxx

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 441b3b5..2c78507 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -74,7 +74,11 @@ ComboBox::~ComboBox()
void ComboBox::dispose()
{
    mpSubEdit.disposeAndClear();
    mpImplLB.disposeAndClear();

    VclPtr< ImplListBox > pImplLB = mpImplLB;
    mpImplLB.clear();
    pImplLB.disposeAndClear();

    mpFloatWin.disposeAndClear();
    mpBtn.disposeAndClear();
    Edit::dispose();

vcl/source/control/ilstbox.cxx

diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index e05746e..dc09182 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2174,10 +2174,9 @@ ImplListBox::~ImplListBox()

void ImplListBox::dispose()
{
    mpHScrollBar.clear();
    mpVScrollBar.clear();
    mpScrollBarBox.clear();
    maLBWindow.clear();
    mpHScrollBar.disposeAndClear();
    mpVScrollBar.disposeAndClear();
    mpScrollBarBox.disposeAndClear();
    maLBWindow.disposeAndClear();
    Control::dispose();
}