[Libreoffice-commits] core.git: 2 commits - svx/source vcl/source

[Caolán McNamara]

 svx/source/sidebar/line/LineWidthControl.cxx |    4 ++--
 vcl/source/window/window.cxx                 |   22 +++++++---------------
 2 files changed, 9 insertions(+), 17 deletions(-)

New commits:
commit 2efb9d3c9841397cca3a66714504ee25d2120bd2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 26 16:59:15 2015 +0100

    Related: tdf#91542 line box width cannot be changed
    
    Change-Id: Ibbeefcff785ee76a1a7ce46d98c1006fc8fe46fc

diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index 6723f6b..2ee411c 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -263,7 +263,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e
 
 IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
 {
-    if (pControl == &maVSWidth)
+    if (pControl == maVSWidth.get())
     {
         sal_uInt16 iPos = maVSWidth->GetSelectItemId();
         if (iPos >= 1 && iPos <= 8)
@@ -308,7 +308,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
 
 IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl)
 {
-    if(pControl == &maMFWidth)
+    if (pControl == maMFWidth.get())
     {
         if(maVSWidth->GetSelItem())
         {
commit 662906ea642c8332428487f0766fb7394fdfd35c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 26 16:36:24 2015 +0100

    if foo delete foo -> delete foo
    
    Change-Id: I62c02f8ad69ddbb1cca5b8f0e4c5673d792cb08b

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 297572e..a51e2d6 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -529,25 +529,17 @@ void Window::dispose()
     // cleanup Extra Window Data, TODO: add and use ImplWinData destructor
     if ( mpWindowImpl->mpWinData )
     {
-        if ( mpWindowImpl->mpWinData->mpExtOldText )
-            delete mpWindowImpl->mpWinData->mpExtOldText;
-        if ( mpWindowImpl->mpWinData->mpExtOldAttrAry )
-            delete mpWindowImpl->mpWinData->mpExtOldAttrAry;
-        if ( mpWindowImpl->mpWinData->mpCursorRect )
-            delete mpWindowImpl->mpWinData->mpCursorRect;
-        if ( mpWindowImpl->mpWinData->mpCompositionCharRects)
-            delete[] mpWindowImpl->mpWinData->mpCompositionCharRects;
-        if ( mpWindowImpl->mpWinData->mpFocusRect )
-            delete mpWindowImpl->mpWinData->mpFocusRect;
-        if ( mpWindowImpl->mpWinData->mpTrackRect )
-            delete mpWindowImpl->mpWinData->mpTrackRect;
-
+        delete mpWindowImpl->mpWinData->mpExtOldText;
+        delete mpWindowImpl->mpWinData->mpExtOldAttrAry;
+        delete mpWindowImpl->mpWinData->mpCursorRect;
+        delete[] mpWindowImpl->mpWinData->mpCompositionCharRects;
+        delete mpWindowImpl->mpWinData->mpFocusRect;
+        delete mpWindowImpl->mpWinData->mpTrackRect;
         delete mpWindowImpl->mpWinData;
     }
 
     // cleanup overlap related window data
-    if ( mpWindowImpl->mpOverlapData )
-        delete mpWindowImpl->mpOverlapData;
+    delete mpWindowImpl->mpOverlapData;
 
     // remove BorderWindow or Frame window data
     mpWindowImpl->mpBorderWindow.disposeAndClear();