From cad5fe48d7a514daea6e5e413398fd42c70ce306 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 16 Jun 2020 17:10:19 +0200 Subject: tdf#132093: Take aUIScale into account again ...which had inadvertently gone missing with bbab991c70e2a1867493d701168f49a0d0dcbd48 "Avoid -fsanitize=implicit-signed-integer-truncation in weld::MetricSpinButton" Change-Id: Idaccb7d1d088f1a3183f19deb3d8ca413d8b1440 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96470 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit ab00a877e00dfd77467fd4eecbe8756bd9806cb5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96429 Reviewed-by: Adolfo Jayme Barrientos --- sd/source/ui/dlg/dlgsnap.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 9657608c23bb..e2db2e8cbc59 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -81,9 +81,11 @@ SdSnapLineDlg::SdSnapLineDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, auto const n4 = msb->convert_value_to(n3, FieldUnit::NONE); return n4; }; - m_xMtrFldX->set_range(map(m_xMtrFldX, aLeftTop.X()), map(m_xMtrFldX, aRightBottom.X()), + m_xMtrFldX->set_range(map(m_xMtrFldX, sal_Int32(aLeftTop.X() / aUIScale)), + map(m_xMtrFldX, sal_Int32(aRightBottom.X() / aUIScale)), FieldUnit::NONE); - m_xMtrFldY->set_range(map(m_xMtrFldY, aLeftTop.Y()), map(m_xMtrFldY, aRightBottom.Y()), + m_xMtrFldY->set_range(map(m_xMtrFldY, sal_Int32(aLeftTop.Y() / aUIScale)), + map(m_xMtrFldY, sal_Int32(aRightBottom.Y() / aUIScale)), FieldUnit::NONE); // set values -- cgit