diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-17 16:58:15 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:44:04 +0100 |
| commit | 15178933b18bc3980890c1cd5a3f0e8ec3d5c744 (patch) | |
| tree | 0dc3130b4ec491efa9236115ea8461871b7b433f /vcl | |
| parent | 462f0ede49cf96e3da1c7d30c39b33e383aa9451 (diff) | |
fix ilistbox dispose.
Change-Id: Icc5b6e924dfeec7a7da4f654d79b17fe91ce1418
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/combobox.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/control/ilstbox.cxx | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 441b3b5d65ee..2c785078841b 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(); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index e05746e1bab6..dc09182ffd5c 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(); } |