mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#96888 Kill internal vcl dog-tags ...

Browse Source 
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@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Ras-al-Ghul
2016-01-07 23:03:28 +05:30
committed by Michael Meeks
parent 6ac256da90
commit accc12efd1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vcl/source/window/winproc.cxx
View File

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