sc/source/ui/view/gridwin4.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 0a3858e33ec3a21406cbf7986f149ae53202204e
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: Fri Feb 16 16:46:56 2024 +0100
clarify that "twipFactor" converts from pixels to 100mm
Change-Id: I7ce9a797b2a2132f0858dafc98bc3a105b8d0098
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163480
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
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 97fff9f65049..051cbc932209 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,
@@ -1059,7 +1063,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();
@@ -1155,7 +1158,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()));
