diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-03 15:18:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-04 10:30:21 +0200 |
| commit | e14c61e617eb221653c176fb91c5ddc074459929 (patch) | |
| tree | a7814ecba852f5ccfff49a68d74df6c3df634d84 | |
| parent | 3259c1058913887f51af456918927a50d139d70d (diff) | |
allow SelMouseButton[Down|Up] without pWin
Change-Id: If5031390ac4a0cdd3dad3b43b23f4319c2dfc53a
Reviewed-on: https://gerrit.libreoffice.org/70217
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/seleng.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 415999a80fa2..84481d6e1933 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -115,7 +115,7 @@ void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 ) bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { nFlags &= ~SelectionEngineFlags::CMDEVT; - if ( !pFunctionSet || !pWin || rMEvt.GetClicks() > 1 || rMEvt.IsRight() ) + if ( !pFunctionSet || rMEvt.GetClicks() > 1 || rMEvt.IsRight() ) return false; sal_uInt16 nModifier = rMEvt.GetModifier() | nLockedMods; @@ -237,7 +237,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) { aWTimer.Stop(); - if( !pFunctionSet || !pWin ) + if (!pFunctionSet) { const SelectionEngineFlags nMask = SelectionEngineFlags::CMDEVT | SelectionEngineFlags::WAIT_UPEVT | SelectionEngineFlags::IN_SEL; nFlags &= ~nMask; @@ -349,7 +349,7 @@ void SelectionEngine::Reset() void SelectionEngine::Command( const CommandEvent& rCEvt ) { // Timer aWTimer is active during enlarging a selection - if ( !pFunctionSet || !pWin || aWTimer.IsActive() ) + if ( !pFunctionSet || aWTimer.IsActive() ) return; aWTimer.Stop(); if ( rCEvt.GetCommand() == CommandEventId::StartDrag ) |