|
 |
f325b2 |
From 81c5808af3987e81f571e0436d04a6a96ccf19ca Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Fri, 13 Nov 2015 11:33:43 +0100
|
|
|
f325b2 |
Subject: [PATCH 322/398] editeng lok: respect origin of map mode for
|
|
|
f325b2 |
INVALIDATE_VISIBLE_CURSOR
|
|
|
f325b2 |
|
|
|
f325b2 |
Writer comments are separate widgets, but we want to have coordinates in
|
|
|
f325b2 |
absolutes twips, so give Writer a chance to inform us about the delta.
|
|
|
f325b2 |
|
|
|
f325b2 |
For now only do this in case the map unit is twips, as Impress sets the
|
|
|
f325b2 |
origin already.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Idf340944165e44b0888c00965d6be7798712ff76
|
|
|
f325b2 |
(cherry picked from commit e988ab84f1c32519bfca758086c749ba98a5a85f)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
editeng/source/editeng/impedit.cxx | 7 +++++++
|
|
|
f325b2 |
1 file changed, 7 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
|
|
|
f325b2 |
index f7e2886c0524..8038ac6d3d41 100644
|
|
|
f325b2 |
--- a/editeng/source/editeng/impedit.cxx
|
|
|
f325b2 |
+++ b/editeng/source/editeng/impedit.cxx
|
|
|
f325b2 |
@@ -947,6 +947,13 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, sal_uInt16
|
|
|
f325b2 |
// LOK output is always in twips, convert from mm100 if necessary.
|
|
|
f325b2 |
if (pOutWin->GetMapMode().GetMapUnit() == MAP_100TH_MM)
|
|
|
f325b2 |
aRect = OutputDevice::LogicToLogic(aRect, MAP_100TH_MM, MAP_TWIP);
|
|
|
f325b2 |
+ else if (pOutWin->GetMapMode().GetMapUnit() == MAP_TWIP)
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ // Writer comments: they use editeng, but are separate widgets.
|
|
|
f325b2 |
+ Point aOrigin = pOutWin->GetMapMode().GetOrigin();
|
|
|
f325b2 |
+ // Move the rectangle, so that we output absolute twips.
|
|
|
f325b2 |
+ aRect.Move(aOrigin.getX(), aOrigin.getY());
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
// Let the LOK client decide the cursor width.
|
|
|
f325b2 |
aRect.setWidth(0);
|
|
|
f325b2 |
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|