From 06e356d430c6621c02ca183426350a613665b082 Mon Sep 17 00:00:00 2001
From: Andrzej Hunt <andrzej.hunt@collabora.com>
Date: Wed, 27 Aug 2014 19:26:28 +0200
Subject: Use logic coordinates for GetMergeSizePixel.

Change-Id: Ie4fae87c3307c601548f29c3b502e3ce4f7e49e0
---
 sc/source/ui/view/viewdata.cxx | 11 +++++------
 1 file 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;
     }
 }
-- 
cgit v1.2.3