[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sc/source

[Ashod Nakashian]

 sc/source/ui/view/gridwin4.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 691ac57ce692c0e7caddc1462970d100f28e5970
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Jun 19 09:51:58 2016 -0400

    LOK: Fix cell editing with zoom
    
    Change-Id: I243e8af47d35a2aae972b15d0b53ff9f41441668
    Reviewed-on: https://gerrit.libreoffice.org/26478
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index ea1bc5c..beceef8 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -944,8 +944,8 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
             aOrigin.setX(aOrigin.getX() / TWIPS_PER_PIXEL + nScrX);
             aOrigin.setY(aOrigin.getY() / TWIPS_PER_PIXEL + nScrY);
             static const double twipFactor = 15 * 1.76388889; // 26.45833335
-            aOrigin = Point(aOrigin.getX() * twipFactor,
-                            aOrigin.getY() * twipFactor);
+            aOrigin = Point(aOrigin.getX() * twipFactor / static_cast<double>(pViewData->GetZoomX()),
+                            aOrigin.getY() * twipFactor / static_cast<double>(pViewData->GetZoomY()));
             MapMode aNew = rDevice.GetMapMode();
             aNew.SetOrigin(aOrigin);
             rDevice.SetMapMode(aNew);