diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-07-21 21:15:39 +0200 |
|---|---|---|
| committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-07-30 14:19:04 +0200 |
| commit | 97f0daebce014693b8c9a8848e3df938da8bd22a (patch) | |
| tree | 089d12e43e236e29f44184db5d63135c974dcbb5 | |
| parent | 46abcb038c779cce39a37c13fbf4ec4179dad346 (diff) | |
Lets not roll our own twip/mm100 conversions.
Change-Id: Id1d0c2bed0359c35086d963dcfe9b765b6232b09
| -rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 08b8013800a2..60a6f471d092 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -27,6 +27,7 @@ #include <editeng/scripttypeitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> +#include <tools/mapunit.hxx> #include <vcl/settings.hxx> #include <svx/svdpage.hxx> @@ -424,9 +425,8 @@ Size ScGridWindow::GetDataAreaSize() SdrPage* pPage = pPageView->GetPage(); Rectangle aDrawDataArea = pPage->GetAllObjBoundRect(); // Draw layer works in 100th mm, whereas we're working with TWIPs. - aDrawDataArea.SetPos( aDrawDataArea.TopLeft() * 1440 / 2540 ); - aDrawDataArea.SetSize( Size( aDrawDataArea.GetSize().Width() * 1440 / 2540, - aDrawDataArea.GetSize().Height() * 1440 / 2540 ) ); + aDrawDataArea.SetPos( convertMm100ToTwip(aDrawDataArea.TopLeft() ) ); + aDrawDataArea.SetSize( convertMm100ToTwip( aDrawDataArea.GetSize() ) ); // We specifically keep iterating until we have covered both the // data area AND the drawing layer area. We also make sure that @@ -641,7 +641,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod MapMode aDrawMode = pOutDev->GetMapMode(); Point aOrigin = aDrawMode.GetOrigin(); aDrawMode.SetMapUnit( MAP_100TH_MM ); - aDrawMode.SetOrigin( (aOrigin * 2540l) / 1440l ); + aDrawMode.SetOrigin( convertTwipToMm100( aOrigin ) ); Rectangle aDrawingRectLogic; { |