vcl/source/edit/vclmedit.cxx | 2 +- vcl/source/window/window2.cxx | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-)
New commits: commit f69701dc2712589fb9f4fce114eafcf857b8c5d2 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Jul 15 20:10:42 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Jul 16 09:28:36 2019 +0200 cid#1448410 Explicit null dereferenced Change-Id: I491e7b0bd2e3aee02f72da907abe4cbae30ce798 Reviewed-on: https://gerrit.libreoffice.org/75654 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 702932278bc1..6a47243a6073 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -631,7 +631,7 @@ bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt ) { ScrollBar* pHScrollBar = mpHScrollBar->IsVisible() ? mpHScrollBar.get() : nullptr; ScrollBar* pVScrollBar = mpVScrollBar->IsVisible() ? mpVScrollBar.get() : nullptr; - (void)mpTextWindow->HandleScrollCommand(rCEvt, pHScrollBar, pVScrollBar); + mpTextWindow->HandleScrollCommand(rCEvt, pHScrollBar, pVScrollBar); bDone = true; } return bDone; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index c38d0f7cdefc..a9d7c042a21a 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -750,23 +750,26 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd, case CommandEventId::Gesture: { - const CommandGestureData* pData = rCmd.GetGestureData(); - if (pData->meEventType == GestureEventType::PanningBegin) + if (pVScrl) { - mpWindowImpl->mpFrameData->mnTouchPanPosition = pVScrl->GetThumbPos(); - } - else if(pData->meEventType == GestureEventType::PanningUpdate) - { - long nOriginalPosition = mpWindowImpl->mpFrameData->mnTouchPanPosition; - pVScrl->DoScroll(nOriginalPosition + (pData->mfOffset / pVScrl->GetVisibleSize())); - } - if (pData->meEventType == GestureEventType::PanningEnd) - { - mpWindowImpl->mpFrameData->mnTouchPanPosition = -1; + const CommandGestureData* pData = rCmd.GetGestureData(); + if (pData->meEventType == GestureEventType::PanningBegin) + { + mpWindowImpl->mpFrameData->mnTouchPanPosition = pVScrl->GetThumbPos(); + } + else if(pData->meEventType == GestureEventType::PanningUpdate) + { + long nOriginalPosition = mpWindowImpl->mpFrameData->mnTouchPanPosition; + pVScrl->DoScroll(nOriginalPosition + (pData->mfOffset / pVScrl->GetVisibleSize())); + } + if (pData->meEventType == GestureEventType::PanningEnd) + { + mpWindowImpl->mpFrameData->mnTouchPanPosition = -1; + } + bRet = true; } - bRet = true; + break; } - break; case CommandEventId::AutoScroll: { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
