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

[Ras-al-Ghul]

 vcl/source/window/winproc.cxx |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit b65af458547264187f28301562db026ef187bec9
Author: Ras-al-Ghul <dipankar1995 at gmail.com>
Date:   Thu Jan 7 23:19:53 2016 +0530

    tdf#96888 Kill internal vcl dog-tags ...
    
    Did a small change in winproc.cxx file. Patch No. 9
    
    Change-Id: I71e3876c0512e2696d61962f2427384354130bb3
    Reviewed-on: https://gerrit.libreoffice.org/21224
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ae6c24d..cdb09cc 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -519,7 +519,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
         }
 
         // test for mouseleave and mouseenter
-        vcl::Window* pMouseMoveWin = pWinFrameData->mpMouseMoveWin;
+        VclPtr<vcl::Window> pMouseMoveWin = pWinFrameData->mpMouseMoveWin;
         if ( pChild != pMouseMoveWin )
         {
             if ( pMouseMoveWin )
@@ -527,19 +527,17 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
                 Point       aLeaveMousePos = pMouseMoveWin->ImplFrameToOutput( aMousePos );
                 MouseEvent  aMLeaveEvt( aLeaveMousePos, nClicks, nMode | MouseEventModifiers::LEAVEWINDOW, nCode, nCode );
                 NotifyEvent aNLeaveEvt( MouseNotifyEvent::MOUSEMOVE, pMouseMoveWin, &aMLeaveEvt );
-                ImplDelData aDelData;
-                ImplDelData aDelData2;
+                VclPtr<vcl::Window> xWindow;
                 pWinFrameData->mbInMouseMove = true;
                 pMouseMoveWin->ImplGetWinData()->mbMouseOver = false;
-                pMouseMoveWin->ImplAddDel( &aDelData );
 
                 // A MouseLeave can destroy this window
                 if ( pChild )
-                    pChild->ImplAddDel( &aDelData2 );
+                    xWindow = pChild;
                 if ( !ImplCallPreNotify( aNLeaveEvt ) )
                 {
                     pMouseMoveWin->MouseMove( aMLeaveEvt );
-                    if( !aDelData.IsDead() )
+                    if( !pMouseMoveWin->IsDisposed() )
                         aNLeaveEvt.GetWindow()->ImplNotifyKeyMouseCommandEventListeners( aNLeaveEvt );
                 }
 
@@ -548,14 +546,13 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
 
                 if ( pChild )
                 {
-                    if ( aDelData2.IsDead() )
+                    if ( xWindow->IsDisposed() )
                         pChild = nullptr;
                     else
-                        pChild->ImplRemoveDel( &aDelData2 );
+                        xWindow.clear();
                 }
-                if ( aDelData.IsDead() )
+                if ( pMouseMoveWin->IsDisposed() )
                     return true;
-                pMouseMoveWin->ImplRemoveDel( &aDelData );
             }
 
             nMode |= MouseEventModifiers::ENTERWINDOW;