[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/source

[Henry Castro]

 sc/source/ui/view/tabview3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 60eede9988bcc37f3683a93bed8ffec23ef3bcc8
Author: Henry Castro <hcastro at collabora.com>
Date:   Mon May 22 09:15:50 2017 -0400

    sc lok: prevent wrong assignment aEnd.Y()
    
    In tiled rendering case, the window size is small, and the
    assignment aEnd.Y() will cause wrong invalidation area.
    
    However, at this time will never happen because MAXTILEDROW < MAXROW,
    so better to avoid in case the last row meets the condition.
    
    Conflicts:
            sc/source/ui/view/tabview3.cxx
    
    Reviewed-on: https://gerrit.libreoffice.org/37908
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    
    Conflicts:
            sc/source/ui/view/tabview3.cxx
    
    Change-Id: I9c6af57c0342f173195bb2f3d8ac5ef0f3964911
    Reviewed-on: https://gerrit.libreoffice.org/37915
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 259b5fe2dd89..2695f013f6df 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2294,7 +2294,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
             aEnd.Y() -= 1;
 
             // #i85232# include area below cells (could be done in GetScrPos?)
-            if ( eMode == SC_UPDATE_ALL && nRow2 >= MAXROW )
+            if ( eMode == SC_UPDATE_ALL && nRow2 >= MAXROW && !bIsTiledRendering )
                 aEnd.Y() = pGridWin[i]->GetOutputSizePixel().Height();
 
             aStart.X() -= nLayoutSign;      // include change marks