Kaydet (Commit) b1ad632c authored tarafından Ras-al-Ghul's avatar Ras-al-Ghul Kaydeden (comit) Michael Meeks

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/21228Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst accc12ef
...@@ -1924,16 +1924,14 @@ static void ImplHandleLoseFocus( vcl::Window* pWindow ) ...@@ -1924,16 +1924,14 @@ static void ImplHandleLoseFocus( vcl::Window* pWindow )
struct DelayedCloseEvent struct DelayedCloseEvent
{ {
VclPtr<vcl::Window> pWindow; VclPtr<vcl::Window> pWindow;
ImplDelData aDelData;
}; };
static void DelayedCloseEventLink( void* pCEvent, void* ) static void DelayedCloseEventLink( void* pCEvent, void* )
{ {
DelayedCloseEvent* pEv = static_cast<DelayedCloseEvent*>(pCEvent); DelayedCloseEvent* pEv = static_cast<DelayedCloseEvent*>(pCEvent);
if( ! pEv->aDelData.IsDead() ) if( ! pEv->pWindow->IsDisposed() )
{ {
pEv->pWindow->ImplRemoveDel( &pEv->aDelData );
// dispatch to correct window type // dispatch to correct window type
if( pEv->pWindow->IsSystemWindow() ) if( pEv->pWindow->IsSystemWindow() )
static_cast<SystemWindow*>(pEv->pWindow.get())->Close(); static_cast<SystemWindow*>(pEv->pWindow.get())->Close();
...@@ -1993,7 +1991,6 @@ void ImplHandleClose( vcl::Window* pWindow ) ...@@ -1993,7 +1991,6 @@ void ImplHandleClose( vcl::Window* pWindow )
{ {
DelayedCloseEvent* pEv = new DelayedCloseEvent; DelayedCloseEvent* pEv = new DelayedCloseEvent;
pEv->pWindow = pWin; pEv->pWindow = pWin;
pWin->ImplAddDel( &pEv->aDelData );
Application::PostUserEvent( Link<void*,void>( pEv, DelayedCloseEventLink ) ); Application::PostUserEvent( Link<void*,void>( pEv, DelayedCloseEventLink ) );
} }
} }
...@@ -2006,7 +2003,6 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) ...@@ -2006,7 +2003,6 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent )
{ {
if ( pSVEvent->mpWindow ) if ( pSVEvent->mpWindow )
{ {
pSVEvent->mpWindow->ImplRemoveDel( &(pSVEvent->maDelData) );
pSVEvent->maLink.Call( pSVEvent->mpData ); pSVEvent->maLink.Call( pSVEvent->mpData );
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment