Fix for tdf#97084 : Scroll view to the ref boundary...

...but maintain the fix for tdf#96524

Change-Id: I35128843d13904e9e0cf9ded559c352acb3c7c46
Reviewed-on: https://gerrit.libreoffice.org/21559Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

sc/source/ui/view/tabview2.cxx

@@ -912,9 +912,19 @@ void ScTabView::ExpandBlock(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode)
 
         pDoc->SkipOverlapped(nNewX, nNewY, nRefTab);
         UpdateRef(nNewX, nNewY, nRefTab);
-        if ((aViewData.GetRefStartX() == MAXCOL || nNewX != MAXCOL) &&
-            (aViewData.GetRefStartY() == MAXROW || nNewY != MAXROW))
-            AlignToCursor(nNewX, nNewY, eMode);
+        SCCOL nTargetCol = nNewX;
+        SCROW nTargetRow = nNewY;
+        if (((aViewData.GetRefStartX() == 0) || (aViewData.GetRefStartY() == 0)) &&
+            ((nNewX != MAXCOL) || (nNewY != MAXROW)))
+        {
+            // Row selection
+            if ((aViewData.GetRefStartX() == 0) && (nNewX == MAXCOL))
+                nTargetCol = aViewData.GetCurX();
+            // Column selection
+            if ((aViewData.GetRefStartY() == 0) && (nNewY == MAXROW))
+                nTargetRow = aViewData.GetCurY();
+        }
+        AlignToCursor(nTargetCol, nTargetRow, eMode);
     }
     else
     {