diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-10 09:07:06 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 10:55:36 +0100 |
| commit | d7a84ce8406096b455d81f50cd50ca2e877adc06 (patch) | |
| tree | b1dd2b5a4860cf2c9664e2ff3087b8dbb9db7576 /framework/source/uielement | |
| parent | c0a802b59e1edddeb0b621e15137f5058299efd7 (diff) | |
vclwidget: only call dispose() once
by using a new utility method in vcl::Window
This means that we don't have to make all our dispose
methods safe to call more than once.
Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374
Diffstat (limited to 'framework/source/uielement')
4 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 84c8fcddb356..adb08e36e809 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -77,7 +77,7 @@ ComboBoxControl::ComboBoxControl( vcl::Window* pParent, WinBits nStyle, IComboBo ComboBoxControl::~ComboBoxControl() { - dispose(); + disposeOnce(); } void ComboBoxControl::dispose() diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 12e8dffc3f92..a8e5ba6fff8c 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -74,7 +74,7 @@ ListBoxControl::ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxLi ListBoxControl::~ListBoxControl() { - dispose(); + disposeOnce(); } void ListBoxControl::dispose() diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index a75aaa3f3956..a586e9f3ad82 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -73,7 +73,7 @@ EditControl::EditControl( vcl::Window* pParent, WinBits nStyle, IEditListener* p EditControl::~EditControl() { - dispose(); + disposeOnce(); } void EditControl::dispose() diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 629e254ebaa0..f3eb2c089c82 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -85,7 +85,7 @@ SpinfieldControl::SpinfieldControl( vcl::Window* pParent, WinBits nStyle, ISpinf SpinfieldControl::~SpinfieldControl() { - dispose(); + disposeOnce(); } void SpinfieldControl::dispose() |