diff options
| author | Dennis Francis <dennis.francis@collabora.com> | 2021-05-25 10:35:22 +0530 |
|---|---|---|
| committer | Dennis Francis <dennis.francis@collabora.com> | 2021-06-08 08:07:27 +0200 |
| commit | eed212b1cc03b8f131e5c28730b0e6a55c3e22af (patch) | |
| tree | 0a0e8ef61b7c27ca1b7aa70d8db23b0eb108a3ea /editeng | |
| parent | 2b7bfe009ac35cb5fda9ca14404fea924acb54fa (diff) | |
sc: lokit: fix wrong edit cursor coordinates for numeric cells
The cursor coordinates returned by editengine implementation is computed
with respect to document-visible-area in "display" hmm and not "print"
hmm. For numeric cells, the visible top-left is always non-zero, hence
triggering this incorrect "refpoint" subtraction to compute "relrect".
The fix is to calculate the correct "relrect" by subtracting the display
hmm version of "refpoint" from the edit cursor rectange and then convert
to twips.
Change-Id: I4b663edcb1f74e1bdcc300788769d580fcfe7e17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116426
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
(cherry picked from commit 77704022556bb97a64ef47666230a2c0232d45d3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116540
Tested-by: Jenkins
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index bf7ac05e868e..919873893575 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1318,11 +1318,15 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor ) MapUnit eDevUnit = rOutDev.GetMapMode().GetMapUnit(); tools::Rectangle aCursorRectPureLogical(aEditCursor.TopLeft(), GetCursor()->GetSize()); - // Get rectangle in window-coordinates from editeng(doc) coordinates. - aCursorRectPureLogical = mpLOKSpecialPositioning->GetWindowPos(aCursorRectPureLogical, eDevUnit); + // Get rectangle in window-coordinates from editeng(doc) coordinates in hmm. + aCursorRectPureLogical = GetWindowPos(aCursorRectPureLogical); + Point aRefPointLogical = GetOutputArea().TopLeft(); + // Get the relative coordinates w.r.t refpoint in display hmm. + aCursorRectPureLogical.Move(-aRefPointLogical.X(), -aRefPointLogical.Y()); + // Convert to twips. + aCursorRectPureLogical = OutputDevice::LogicToLogic(aCursorRectPureLogical, MapMode(eDevUnit), MapMode(MapUnit::MapTwip)); + // "refpoint" in print twips. const Point aRefPoint = mpLOKSpecialPositioning->GetRefPoint(); - // Get the relative coordinates w.r.t rRefPoint. - aCursorRectPureLogical.Move(-aRefPoint.X(), -aRefPoint.Y()); aMessageParams.put("relrect", aCursorRectPureLogical.toString()); aMessageParams.put("refpoint", aRefPoint.toString()); } |