From accc12efd1db250b7e3c22b6bd70a1e4393bae6b Mon Sep 17 00:00:00 2001 From: Ras-al-Ghul Date: Thu, 7 Jan 2016 23:03:28 +0530 Subject: [PATCH] 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 Reviewed-by: Michael Meeks --- vcl/source/window/winproc.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ef4cb769e18e..a7dca9a0e57c 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 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;