diff options
Diffstat (limited to 'sw/source/core/uibase/uiview/viewport.cxx')
-rw-r--r-- | sw/source/core/uibase/uiview/viewport.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sw/source/core/uibase/uiview/viewport.cxx b/sw/source/core/uibase/uiview/viewport.cxx index 119e03e05d91..21ecf81eaf78 100644 --- a/sw/source/core/uibase/uiview/viewport.cxx +++ b/sw/source/core/uibase/uiview/viewport.cxx @@ -1187,14 +1187,9 @@ void SwView::Move() sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) { - const CommandWheelData* pWData = rCEvt.GetWheelData(); - if (!pWData) - { - return sal_False; - } - sal_Bool bOk = sal_False; - if( COMMAND_WHEEL_ZOOM == pWData->GetMode() ) + const CommandWheelData* pWData = rCEvt.GetWheelData(); + if (pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode()) { long nFact = m_pWrtShell->GetViewOptions()->GetZoom(); if( 0L > pWData->GetDelta() ) @@ -1205,7 +1200,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) SetZoom( SVX_ZOOM_PERCENT, nFact ); bOk = sal_True; } - else if( COMMAND_WHEEL_ZOOM_SCALE == pWData->GetMode() ) + else if (pWData && COMMAND_WHEEL_ZOOM_SCALE == pWData->GetMode()) { // mobile touch zoom (pinch) section // remember the center location to reach in logic @@ -1249,13 +1244,13 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) } else { - if( pWData->GetMode()==COMMAND_WHEEL_SCROLL ) + if (pWData && pWData->GetMode()==COMMAND_WHEEL_SCROLL) { // This influences whether quick help is shown m_bWheelScrollInProgress=true; } - if( (COMMAND_WHEEL_SCROLL==pWData->GetMode()) && (((sal_uLong)0xFFFFFFFF) == pWData->GetScrollLines()) ) + if (pWData && (COMMAND_WHEEL_SCROLL==pWData->GetMode()) && (((sal_uLong)0xFFFFFFFF) == pWData->GetScrollLines())) { if (pWData->GetDelta()<0) PhyPageDown(); |