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

[Henry Castro]

 sc/source/ui/view/tabview3.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 45349eb0d38e6166ec390258b3cdef9c37c5548a
Author: Henry Castro <hcastro at collabora.com>
Date:   Wed May 17 16:19:47 2017 -0400

    sc lok: fix wrong assignment aEnd.X()
    
    In tiled rendering case, the window size is small and the end
    point will be cut, then result wrong invalidation area
    
    Change-Id: Ief49c5f47bbc69485354ab396c7508db9548f82a
    Reviewed-on: https://gerrit.libreoffice.org/37737
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/37753
    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 01c6774970c6..259b5fe2dd89 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2216,6 +2216,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
     SCROW nRow1;
     SCCOL nCol2;
     SCROW nRow2;
+    bool bIsTiledRendering = comphelper::LibreOfficeKit::isActive();
 
     PutInOrder( nStartCol, nEndCol );
     PutInOrder( nStartRow, nEndRow );
@@ -2237,7 +2238,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
         SCCOL nLastX = 0;
         SCROW nLastY = 0;
 
-        if (comphelper::LibreOfficeKit::isActive())
+        if (bIsTiledRendering)
         {
             nLastX = aViewData.GetMaxTiledCol();
             nLastY = aViewData.GetMaxTiledRow();
@@ -2288,7 +2289,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
             Point aStart = aViewData.GetScrPos( nCol1, nRow1, (ScSplitPos) i );
             Point aEnd   = aViewData.GetScrPos( nCol2+1, nRow2+1, (ScSplitPos) i );
             if ( eMode == SC_UPDATE_ALL )
-                aEnd.X() = bLayoutRTL ? 0 : (pGridWin[i]->GetOutputSizePixel().Width());
+                aEnd.X() = bLayoutRTL ? 0 : (bIsTiledRendering ? aEnd.X() : pGridWin[i]->GetOutputSizePixel().Width());
             aEnd.X() -= nLayoutSign;
             aEnd.Y() -= 1;