From e45ac7edaf0520a80ddc4e0880e41d9f8e6be61a Mon Sep 17 00:00:00 2001 From: Marco Cecchetti Date: Tue, 10 Dec 2019 10:57:32 +0100 Subject: lok: calc: zoomed text entry not rendered Change-Id: I829966d81bd68571a0651feb458a817587e4d88e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84992 Tested-by: Jenkins Reviewed-by: Andras Timar --- sc/source/ui/view/gridwin4.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'sc/source') diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 9426c8842bf0..2f1285e1a4e2 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -945,8 +945,10 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI rDevice.SetMapMode(aDrawMode); static const double twipFactor = 15 * 1.76388889; // 26.45833335 - aOrigin = Point(aOrigin.getX() * twipFactor, - aOrigin.getY() * twipFactor); + // keep into account the zoom factor + aOrigin = Point((aOrigin.getX() * twipFactor) / static_cast(aDrawMode.GetScaleX()), + (aOrigin.getY() * twipFactor) / static_cast(aDrawMode.GetScaleY())); + MapMode aNew = rDevice.GetMapMode(); aNew.SetOrigin(aOrigin); rDevice.SetMapMode(aNew); @@ -1017,8 +1019,9 @@ 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); + // keep into account the zoom factor + aOrigin = Point((aOrigin.getX() * twipFactor) / static_cast(aDrawMode.GetScaleX()), + (aOrigin.getY() * twipFactor) / static_cast(aDrawMode.GetScaleY())); MapMode aNew = rDevice.GetMapMode(); aNew.SetOrigin(aOrigin); rDevice.SetMapMode(aNew); -- cgit v1.2.3