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

[Ras-al-Ghul]

 vcl/source/window/winproc.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit b1ad632c72e38973265ad0d3f31120108f120660
Author: Ras-al-Ghul <dipankar1995 at gmail.com>
Date:   Fri Jan 8 00:16:24 2016 +0530

    tdf#96888 Kill internal vcl dog-tags ...
    
    Did some changes to winproc.cxx file. Patch No. 12
    
    Change-Id: I32551d527a2d45b694418bfee19be5e8704ce60e
    Reviewed-on: https://gerrit.libreoffice.org/21228
    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 a7dca9a..ae6c24d 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1924,16 +1924,14 @@ static void ImplHandleLoseFocus( vcl::Window* pWindow )
 struct DelayedCloseEvent
 {
     VclPtr<vcl::Window> pWindow;
-    ImplDelData     aDelData;
 };
 
 static void DelayedCloseEventLink( void* pCEvent, void* )
 {
     DelayedCloseEvent* pEv = static_cast<DelayedCloseEvent*>(pCEvent);
 
-    if( ! pEv->aDelData.IsDead() )
+    if( ! pEv->pWindow->IsDisposed() )
     {
-        pEv->pWindow->ImplRemoveDel( &pEv->aDelData );
         // dispatch to correct window type
         if( pEv->pWindow->IsSystemWindow() )
             static_cast<SystemWindow*>(pEv->pWindow.get())->Close();
@@ -1993,7 +1991,6 @@ void ImplHandleClose( vcl::Window* pWindow )
     {
         DelayedCloseEvent* pEv = new DelayedCloseEvent;
         pEv->pWindow = pWin;
-        pWin->ImplAddDel( &pEv->aDelData );
         Application::PostUserEvent( Link<void*,void>( pEv, DelayedCloseEventLink ) );
     }
 }
@@ -2006,7 +2003,6 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent )
         {
             if ( pSVEvent->mpWindow )
             {
-                pSVEvent->mpWindow->ImplRemoveDel( &(pSVEvent->maDelData) );
                 pSVEvent->maLink.Call( pSVEvent->mpData );
             }
             else