Kaydet (Commit) 3259c105 authored tarafından Caolán McNamara's avatar Caolán McNamara

add nullchecking SelectionEngine::CaptureMouse

Change-Id: Ie8594c8fe2a9e2d84121f3a6a1ee8afab265b14f
Reviewed-on: https://gerrit.libreoffice.org/70216
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 59c15729
......@@ -104,6 +104,7 @@ public:
//context menu via "Command" which is delivered after
//mouse down but before mouse up, then use this
void ReleaseMouse();
void CaptureMouse();
// Keyboard
void CursorPosChanging( bool bShift, bool bMod1 );
......
......@@ -131,7 +131,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
if( !rMEvt.IsRight() )
{
pWin->CaptureMouse();
CaptureMouse();
nFlags |= SelectionEngineFlags::IN_SEL;
}
else
......@@ -284,6 +284,13 @@ void SelectionEngine::ReleaseMouse()
pWin->ReleaseMouse();
}
void SelectionEngine::CaptureMouse()
{
if (!pWin || pWin->IsMouseCaptured())
return;
pWin->CaptureMouse();
}
bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt )
{
......@@ -325,8 +332,8 @@ void SelectionEngine::SetWindow( vcl::Window* pNewWin )
if (nFlags & SelectionEngineFlags::IN_SEL)
ReleaseMouse();
pWin = pNewWin;
if ( pWin && ( nFlags & SelectionEngineFlags::IN_SEL ) )
pWin->CaptureMouse();
if (nFlags & SelectionEngineFlags::IN_SEL)
CaptureMouse();
}
}
......
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