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

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/21220Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst 29cd6b92
...@@ -336,7 +336,6 @@ void Window::RemoveUserEvent( ImplSVEvent * nUserEvent ) ...@@ -336,7 +336,6 @@ void Window::RemoveUserEvent( ImplSVEvent * nUserEvent )
if ( nUserEvent->mpWindow ) if ( nUserEvent->mpWindow )
{ {
nUserEvent->mpWindow->ImplRemoveDel( &(nUserEvent->maDelData) );
nUserEvent->mpWindow = nullptr; nUserEvent->mpWindow = nullptr;
} }
...@@ -390,8 +389,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) ...@@ -390,8 +389,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
// this allows for processing those events internally first and pass it to // this allows for processing those events internally first and pass it to
// the toolkit later // the toolkit later
ImplDelData aDelData; VclPtr<vcl::Window> xWindow = this;
ImplAddDel( &aDelData );
if( rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE ) if( rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE )
{ {
...@@ -443,9 +441,8 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) ...@@ -443,9 +441,8 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
CallEventListeners( VCLEVENT_WINDOW_KEYUP, const_cast<KeyEvent *>(rNEvt.GetKeyEvent()) ); CallEventListeners( VCLEVENT_WINDOW_KEYUP, const_cast<KeyEvent *>(rNEvt.GetKeyEvent()) );
} }
if ( aDelData.IsDead() ) if ( xWindow->IsDisposed() )
return; return;
ImplRemoveDel( &aDelData );
// #106721# check if we're part of a compound control and notify // #106721# check if we're part of a compound control and notify
vcl::Window *pParent = ImplGetParent(); vcl::Window *pParent = ImplGetParent();
......
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