[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - editeng/source

[Dennis Francis (via logerrit)]

 editeng/source/editeng/impedit.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit c5e249877b93e9d11788ec04fffee1dcb142a0e5
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Tue May 25 10:53:22 2021 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Tue Jun 1 10:18:10 2021 +0200

    sc: lok: apply the previous fix for selections too
    
    Change-Id: Ic1f6c1642da71e0ef8c23831786ae405dda21133
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116427
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index fd76fe4d8d52..ca12e22fc197 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -660,9 +660,12 @@ void ImpEditView::ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rD
         {
             MapUnit eDevUnit = _pTarget->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();