summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-08-27 19:26:28 +0200
committerAndrzej Hunt <andrzej.hunt@collabora.com>2014-08-30 21:37:13 +0200
commit06e356d430c6621c02ca183426350a613665b082 (patch)
treeab63480c1ff7ad491d3513fd4a6d5ededad8965a
parentbf62b4027fd2f7b1a956b5f11f8eef5e9dae8b5c (diff)
Use logic coordinates for GetMergeSizePixel.
Change-Id: Ie4fae87c3307c601548f29c3b502e3ce4f7e49e0
-rw-r--r--sc/source/ui/view/viewdata.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 851a22ba747a..6b2fa1d4af27 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1746,18 +1746,17 @@ bool ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r
continue;
}
- sal_uInt16 nHeight = pDoc->GetRowHeight(nRow, nTabNo);
- nOutHeight += ToPixel(nHeight, nPPTY);
+ nOutHeightTwips += pDoc->GetRowHeight(nRow, nTabNo);
}
- rSizeXPix = nOutWidth;
- rSizeYPix = nOutHeight;
+ rSizeXPix = LogicToPixelHorizontal( nOutWidthTwips );
+ rSizeYPix = LogicToPixelVertical( nOutHeightTwips );
return true;
}
else
{
- rSizeXPix = ToPixel( pDoc->GetColWidth( nX, nTabNo ), nPPTX );
- rSizeYPix = ToPixel( pDoc->GetRowHeight( nY, nTabNo ), nPPTY );
+ rSizeXPix = LogicToPixelHorizontal( pDoc->GetColWidth( nX, nTabNo ) );
+ rSizeYPix = LogicToPixelVertical( pDoc->GetRowHeight( nY, nTabNo ) );
return false;
}
}