[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

[Michael Stahl]

 sw/source/ui/uiview/viewport.cxx |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 6857a266c5e8037f097ed7e727671f7da543f178
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Mar 14 23:08:11 2014 +0100

    fdo#75460: sw: fix AutoScroll
    
    This reverts commit 5141201fba2d080841b81e02be92f4b47aae2684. which
    fixed a crash but unfortunately also prevents the
    m_pEditWin->HandleScrollCommand from being called, thus disabling
    AutoScroll.  Fix the crash in the ugly way by another pWData check.
    
    (regression from 8880c773e779710dc0a08760e92afd709a73ca31)
    
    Change-Id: I958f1403ad23d0c0631eca5dbbef977a9ca1210d
    (cherry picked from commit 6795b251e2011cae945c6bb903de8053953b5e30)
    Reviewed-on: https://gerrit.libreoffice.org/8596
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 1d4acb3..ac0b21a 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1242,14 +1242,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() )
@@ -1260,7 +1255,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
@@ -1304,13 +1299,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();