summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Francis <dennis.francis@collabora.com>2021-05-25 10:53:22 +0530
committerDennis Francis <dennis.francis@collabora.com>2021-06-08 08:07:54 +0200
commitc844aa36cc4268f182ec4f6627fb2b8f4cce7b15 (patch)
treeb61f554d440b7ad2f02e85f07eaa3e68de6accb9
parenteed212b1cc03b8f131e5c28730b0e6a55c3e22af (diff)
sc: lok: apply the previous fix for selections too
Conflicts: editeng/source/editeng/impedit.cxx Change-Id: Ic1f6c1642da71e0ef8c23831786ae405dda21133 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116427 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> (cherry picked from commit c5e249877b93e9d11788ec04fffee1dcb142a0e5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116541 Tested-by: Jenkins
-rw-r--r--editeng/source/editeng/impedit.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 919873893575..653072083f66 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -660,9 +660,12 @@ void ImpEditView::ImplDrawHighlightRect( OutputDevice& rTarget, const Point& rDo
{
MapUnit eDevUnit = rTarget.GetMapMode().GetMapUnit();
tools::Rectangle aSelRect(rDocPosTopLeft, rDocPosBottomRight);
- aSelRect = mpLOKSpecialPositioning->GetWindowPos(aSelRect, eDevUnit);
- const Point aRefPoint = mpLOKSpecialPositioning->GetRefPoint();
- aSelRect.Move(-aRefPoint.X(), -aRefPoint.Y());
+ aSelRect = GetWindowPos(aSelRect);
+ Point aRefPointLogical = GetOutputArea().TopLeft();
+ // Get the relative coordinates w.r.t refpoint in display units.
+ aSelRect.Move(-aRefPointLogical.X(), -aRefPointLogical.Y());
+ // Convert from display unit to twips.
+ aSelRect = OutputDevice::LogicToLogic(aSelRect, MapMode(eDevUnit), MapMode(MapUnit::MapTwip));
tools::Polygon aTmpPoly(4);
aTmpPoly[0] = aSelRect.TopLeft();