summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-08-11 21:23:35 +0200
committerAndrzej Hunt <andrzej.hunt@collabora.com>2014-08-11 21:23:35 +0200
commit7e00e97534a6df416d10f6d098dc746daf3030da (patch)
tree0d512d10810ca4ba0c17ecbfb0591a22d03181d9
parent2904c469fc84fe7fb973e499d9d8b34c4919b3b3 (diff)
Return to pixRect in Paint.feature/calctiledrendering_alt
Change-Id: I8ee807ba94c3e372b8dd1cbbf9302aaf9e85f323
-rw-r--r--sc/source/ui/view/gridwin4.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 38dc775629e6..239fd0d45304 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -342,20 +342,18 @@ void ScGridWindow::Paint( const Rectangle& rRect, OutputDevice* pOutDev )
bIsInPaint = true;
- Rectangle aPixRect = LogicToPixel( rRect, maPaintMapMode );
-
SCCOL nX1 = pViewData->GetPosX(eHWhich);
SCROW nY1 = pViewData->GetPosY(eVWhich);
SCTAB nTab = pViewData->GetTabNo();
- Rectangle aMirroredPixel = aPixRect;
+ Rectangle aMirroredPixel = rRect;
if ( pDoc->IsLayoutRTL( nTab ) )
{
// mirror and swap
long nWidth = GetSizePixel().Width();
- aMirroredPixel.Left() = nWidth - 1 - aPixRect.Right();
- aMirroredPixel.Right() = nWidth - 1 - aPixRect.Left();
+ aMirroredPixel.Left() = nWidth - 1 - rRect.Right();
+ aMirroredPixel.Right() = nWidth - 1 - rRect.Left();
}
long nScrX = LogicToPixel( Point( pDoc->GetColWidth( nX1, nTab ), 0 ), maPaintMapMode ).getX();/*ScViewData::ToPixel( pDoc->GetColWidth( nX1, nTab ), nPPTX );*/
@@ -372,13 +370,13 @@ void ScGridWindow::Paint( const Rectangle& rRect, OutputDevice* pOutDev )
}
long nScrY = 0;
- while ( nScrY < aPixRect.Top() && nY1 < MAXROW )
+ while ( nScrY < rRect.Top() && nY1 < MAXROW )
{
++nY1;
nScrY += LogicToPixel( Point( 0, pDoc->GetRowHeight( nY1, nTab ) ), maPaintMapMode ).getY();
}
SCROW nY2 = nY1;
- while ( nScrY <= aPixRect.Bottom() && nY2 < MAXROW )
+ while ( nScrY <= rRect.Bottom() && nY2 < MAXROW )
{
++nY2;
nScrY += LogicToPixel( Point( 0, pDoc->GetRowHeight( nY2, nTab ) ), maPaintMapMode ).getY();