sc/source/ui/view/gridwin4.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 8baacea92374319e6f796dca4d1aec7663647105 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Thu Feb 15 21:36:46 2024 +0000 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Sat Feb 17 12:15:27 2024 +0100 clarify that "twipFactor" converts from pixels to 100mm Change-Id: I7ce9a797b2a2132f0858dafc98bc3a105b8d0098 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163479 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index f4aeabfc1447..463b5ac32704 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -658,6 +658,10 @@ Fraction GetZoom(const ScViewData& rViewData, int i) }; return (rViewData.*GetZooms[i])(); } + +// Multiplying by this is basically equivalent to o3tl::convert(foo, o3tl::Length::px, o3tl::Length::mm100) +// Where there are 15 twips in an ideal pixel and 1 twip is 0.0017638889 cm +constexpr double twipFactor = 15 * 1.76388889; // 26.45833335 } void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableInfo, ScOutputData& aOutputData, @@ -1058,7 +1062,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI aOrigin.setY(o3tl::convert(aOrigin.getY(), o3tl::Length::twip, o3tl::Length::px) + aOutputData.nScrY); - const double twipFactor = 15 * 1.76388889; // 26.45833335 aOrigin = Point(aOrigin.getX() * twipFactor, aOrigin.getY() * twipFactor); MapMode aNew = rDevice.GetMapMode(); @@ -1154,7 +1157,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI rDevice.SetMapMode(aDrawMode); // keep into account the zoom factor - static const double twipFactor = 15 * 1.76388889; // 26.45833335 Point aNewOrigin((aOriginAbsPx.getX() * twipFactor) / static_cast<double>(aDrawMode.GetScaleX()), (aOriginAbsPx.getY() * twipFactor) / static_cast<double>(aDrawMode.GetScaleY()));