sc/source/ui/view/gridwin4.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 74f477d8aa8af7d8b95e28a43c34f78befa09388 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Thu Feb 15 21:36:46 2024 +0000 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Fri Feb 16 16:46:17 2024 +0100 clarify that "twipFactor" converts from pixels to 100mm Change-Id: I7ce9a797b2a2132f0858dafc98bc3a105b8d0098 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163466 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 1feb6bbff42a..0243b92a0a53 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -659,6 +659,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, @@ -1056,7 +1060,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(); @@ -1152,7 +1155,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 = Point((aOriginAbsPx.getX() * twipFactor) / static_cast<double>(aDrawMode.GetScaleX()), (aOriginAbsPx.getY() * twipFactor) / static_cast<double>(aDrawMode.GetScaleY()));