[Libreoffice-commits] core.git: Branch 'feature/vclref' - vcl/source

[Michael Meeks]

 vcl/source/control/button.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4967e916129e0e8e23954e8ed9a3b2440cc36c19
Author: Michael Meeks <michael.me...@collabora.com>
Date:   Thu Mar 26 22:29:54 2015 +0000

    no need to free mpButtonData in dispose.
    
    Change-Id: Ie6f135d9e91d0831717c2a0726161825d0a06665

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 9233791..7d5e291 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -102,12 +102,11 @@ Button::Button( WindowType nType ) :
 Button::~Button()
 {
     disposeOnce();
+    delete mpButtonData;
 }
 
 void Button::dispose()
 {
-    delete mpButtonData;
-    mpButtonData = NULL;
     Control::dispose();
 }
 
@@ -548,7 +547,7 @@ sal_uInt16& Button::ImplGetButtonState()
 
 sal_uInt16 Button::ImplGetButtonState() const
 {
-    return mpButtonData ? mpButtonData->mnButtonState : 0;
+    return mpButtonData->mnButtonState;
 }
 
 void Button::ImplSetSymbolAlign( SymbolAlign eAlign )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits