diff options
author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-08-27 19:26:28 +0200 |
---|---|---|
committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-08-27 19:26:28 +0200 |
commit | 3bb0d0983bf4953138ee1e5ea92c7aa95e972551 (patch) | |
tree | 4c843fa00d3b36bbe36ef91e038045a96683f308 | |
parent | b2ee26b36bb1f4bf0ddba2f507b73a98b28b82e7 (diff) |
Use logic coordinates for GetMergeSizePixel.
Change-Id: Ie4fae87c3307c601548f29c3b502e3ce4f7e49e0
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 11 |
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; } } |