diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-05-12 16:52:54 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-05-12 17:38:31 +0200 |
| commit | 5141201fba2d080841b81e02be92f4b47aae2684 (patch) | |
| tree | fea41badd75ab0d767f39015bb008ec709229a6c | |
| parent | 4da833308a496363cd05baad577a073e5bfb0872 (diff) | |
Return early in case of NULL pointer
Change-Id: I1c31608b960f750ef777d214ac482c4f52b44aff
| -rw-r--r-- | sw/source/ui/uiview/viewport.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index a273495e7c60..0e87e455af9e 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -1253,9 +1253,14 @@ void SwView::Move() sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) { - sal_Bool bOk = sal_False; const CommandWheelData* pWData = rCEvt.GetWheelData(); - if( pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode() ) + if (!pWData) + { + return sal_False; + } + + sal_Bool bOk = sal_False; + if( COMMAND_WHEEL_ZOOM == pWData->GetMode() ) { long nFact = m_pWrtShell->GetViewOptions()->GetZoom(); if( 0L > pWData->GetDelta() ) @@ -1266,7 +1271,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) SetZoom( SVX_ZOOM_PERCENT, nFact ); bOk = sal_True; } - else if( pWData && COMMAND_WHEEL_ZOOM_SCALE == pWData->GetMode() ) + else if( COMMAND_WHEEL_ZOOM_SCALE == pWData->GetMode() ) { int newZoom = 100 * (m_pWrtShell->GetViewOptions()->GetZoom() / 100.0) * (pWData->GetDelta() / 100.0); SetZoom( SVX_ZOOM_PERCENT, std::max( 20, std::min( 600, newZoom ) ) ); @@ -1280,7 +1285,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) m_bWheelScrollInProgress=true; } - if (pWData && (COMMAND_WHEEL_SCROLL==pWData->GetMode()) && (((sal_uLong)0xFFFFFFFF) == pWData->GetScrollLines())) + if ((COMMAND_WHEEL_SCROLL==pWData->GetMode()) && (((sal_uLong)0xFFFFFFFF) == pWData->GetScrollLines())) { if (pWData->GetDelta()<0) PhyPageDown(); |