diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-26 22:29:54 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:08:14 +0100 |
| commit | 1757fb4a49050ecef14c0c71b81cee9a0759e36b (patch) | |
| tree | 0cd88495ea253ac9e6915ac228233e3fb60c70c9 | |
| parent | 8dd74ea0862170c7705a6b9468dc16ee5e8c419b (diff) | |
no need to free mpButtonData in dispose.
Change-Id: Ie6f135d9e91d0831717c2a0726161825d0a06665
| -rw-r--r-- | vcl/source/control/button.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 7bcea274c659..09a6ee513058 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -96,12 +96,11 @@ Button::Button( WindowType nType ) : Button::~Button() { disposeOnce(); + delete mpButtonData; } void Button::dispose() { - delete mpButtonData; - mpButtonData = NULL; Control::dispose(); } @@ -542,7 +541,7 @@ sal_uInt16& Button::ImplGetButtonState() sal_uInt16 Button::ImplGetButtonState() const { - return mpButtonData ? mpButtonData->mnButtonState : 0; + return mpButtonData->mnButtonState; } void Button::ImplSetSymbolAlign( SymbolAlign eAlign ) |