diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-22 17:46:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-22 17:46:08 +0100 |
| commit | 04d4af8496c8fae5515c7f76e143310eb7098702 (patch) | |
| tree | 57b545b39b0c2a853fac2e508f9bc2974b2bd58e /vcl | |
| parent | 8d84f24a190d3290d8ef5aeee451fc37f293406d (diff) | |
ImplSVEvent::maDelData is unused now
...since 47bac0de19fc4ca2c9d469b64fcbffe15bc4a0a3 "tdf#96888 Kill internal vcl
dog-tags ..." removed its last use
Change-Id: I4a6c6f87f99dfa5ff2f6f5abdb028a99b1996345
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/svdata.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 285d84778f43..8c616f7f0878 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 ce784a06e0af..b22812eda1c2 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 0a1225a50fd0..58211dace047 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 ); } |