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

[Ras-al-Ghul]

 vcl/source/window/event.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit da8f57d9c9b4c6efb211d1d69f7e240523d0bc43
Author: Ras-al-Ghul <dipankar1995 at gmail.com>
Date:   Thu Jan 7 22:49:10 2016 +0530

    tdf#96888 Kill internal vcl dog-tags ...
    
    Did a small change to to void Window::RemoveUserEvent( ImplSVEvent * nUserEvent ) and to void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) in event.cxx file. Patch No. 6
    
    Change-Id: I75bc321d2a257df00f51d7e71aed2bc26500e58e
    Reviewed-on: https://gerrit.libreoffice.org/21220
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index a4a64c1..7e4e07c 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -336,7 +336,6 @@ void Window::RemoveUserEvent( ImplSVEvent * nUserEvent )
 
     if ( nUserEvent->mpWindow )
     {
-        nUserEvent->mpWindow->ImplRemoveDel( &(nUserEvent->maDelData) );
         nUserEvent->mpWindow = nullptr;
     }
 
@@ -390,8 +389,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
     // this allows for processing those events internally first and pass it to
     // the toolkit later
 
-    ImplDelData aDelData;
-    ImplAddDel( &aDelData );
+    VclPtr<vcl::Window> xWindow = this;
 
     if( rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE )
     {
@@ -443,9 +441,8 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
             CallEventListeners( VCLEVENT_WINDOW_KEYUP, const_cast<KeyEvent *>(rNEvt.GetKeyEvent()) );
     }
 
-    if ( aDelData.IsDead() )
+    if ( xWindow->IsDisposed() )
         return;
-    ImplRemoveDel( &aDelData );
 
     // #106721# check if we're part of a compound control and notify
     vcl::Window *pParent = ImplGetParent();