vcl/inc/svdata.hxx | 3 +-- vcl/source/app/svapp.cxx | 7 +------ vcl/source/window/winproc.cxx | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-)
New commits: commit 04d4af8496c8fae5515c7f76e143310eb7098702 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Jan 22 17:46:08 2016 +0100 ImplSVEvent::maDelData is unused now ...since 47bac0de19fc4ca2c9d469b64fcbffe15bc4a0a3 "tdf#96888 Kill internal vcl dog-tags ..." removed its last use Change-Id: I4a6c6f87f99dfa5ff2f6f5abdb028a99b1996345 diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 285d847..8c616f7 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -412,10 +412,9 @@ struct ImplSVEvent Link<void*,void> maLink; VclPtr<vcl::Window> mpInstanceRef; VclPtr<vcl::Window> mpWindow; - ImplDelData maDelData; bool mbCall; }; #endif // INCLUDED_VCL_INC_SVDATA_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index ce784a0..b22812e 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1068,12 +1068,7 @@ void Application::RemoveUserEvent( ImplSVEvent * nUserEvent ) DBG_ASSERT( nUserEvent->mbCall, "Application::RemoveUserEvent(): Event is already removed" ); - if ( nUserEvent->mpWindow ) - { - if( ! nUserEvent->maDelData.IsDead() ) - nUserEvent->mpWindow->ImplRemoveDel( &(nUserEvent->maDelData) ); - nUserEvent->mpWindow.clear(); - } + nUserEvent->mpWindow.clear(); nUserEvent->mpInstanceRef.clear(); nUserEvent->mbCall = false; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 0a1225a..58211da 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1970,7 +1970,7 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) { if ( pSVEvent ) { - if ( pSVEvent->mbCall && !pSVEvent->maDelData.IsDead() ) + if ( pSVEvent->mbCall ) { pSVEvent->maLink.Call( pSVEvent->mpData ); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits