[Libreoffice-commits] core.git: sc/source

Henry Castro hcastro at collabora.com
Mon May 22 18:12:49 UTC 2017


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

New commits:
commit 63e801a60478117846e57e98d7b316d9fe711d9a
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
    
    Change-Id: I9c6af57c0342f173195bb2f3d8ac5ef0f3964911
    Reviewed-on: https://gerrit.libreoffice.org/37908
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 9cf18abfe6e2..8d529e3b355b 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2302,7 +2302,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 == ScUpdateMode::All && nRow2 >= MAXROW )
+        if ( eMode == ScUpdateMode::All && nRow2 >= MAXROW && !bIsTiledRendering )
             aEnd.Y() = pGridWin[i]->GetOutputSizePixel().Height();
 
         aStart.X() -= nLayoutSign;      // include change marks


More information about the Libreoffice-commits mailing list