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

Ras-al-Ghul dipankar1995 at gmail.com
Fri Jan 8 01:55:35 PST 2016


 vcl/source/window/winproc.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

    tdf#96888 Kill internal vcl dog-tags ...
    
    Did a small change to static bool ImplCallCommand( vcl::Window* pChild, ...) in winproc.cxx file. Patch No. 7
    
    Change-Id: Ib2929ff2fe98487461f2d8ec768fab8d4cd45c22
    Reviewed-on: https://gerrit.libreoffice.org/21221
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ef4cb76..a7dca9a 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -216,19 +216,19 @@ static bool ImplCallCommand( vcl::Window* pChild, CommandEventId nEvt, void* pDa
 
     CommandEvent    aCEvt( aPos, nEvt, bMouse, pData );
     NotifyEvent     aNCmdEvt( MouseNotifyEvent::COMMAND, pChild, &aCEvt );
-    ImplDelData     aDelData( pChild );
+    VclPtr<vcl::Window> xWindow = pChild;
     bool bPreNotify = ImplCallPreNotify( aNCmdEvt );
-    if ( aDelData.IsDead() )
+    if ( xWindow->IsDisposed() )
         return false;
     if ( !bPreNotify )
     {
         pChild->ImplGetWindowImpl()->mbCommand = false;
         pChild->Command( aCEvt );
 
-        if( aDelData.IsDead() )
+        if( xWindow->IsDisposed() )
             return false;
         pChild->ImplNotifyKeyMouseCommandEventListeners( aNCmdEvt );
-        if ( aDelData.IsDead() )
+        if ( xWindow->IsDisposed() )
             return false;
         if ( pChild->ImplGetWindowImpl()->mbCommand )
             return true;


More information about the Libreoffice-commits mailing list