|
 |
f325b2 |
From 2ab4afba1e464e0a581fd9200ed0c31567982010 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 24 Nov 2015 15:37:29 +0100
|
|
|
f325b2 |
Subject: [PATCH 362/398] sw lok comments: fix map mode state after changing
|
|
|
f325b2 |
zoom levels
|
|
|
f325b2 |
|
|
|
f325b2 |
Zoom level of SwEditWin is kept in sync with the client, so that the
|
|
|
f325b2 |
pixel-based comment widgets can be positioned correctly. But that does
|
|
|
f325b2 |
not mean in general the SwEditWin map mode should not be disabled: so
|
|
|
f325b2 |
that we don't have to tweak the map mode for each and every
|
|
|
f325b2 |
postMouseEvent() call and still be able to send them using logic
|
|
|
f325b2 |
coordinates.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I6f686b93d2509d52fdd34e84a502cf04e1ce6e59
|
|
|
f325b2 |
(cherry picked from commit de2a6897876976d769504a36abf54eced626b01c)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sw/source/core/view/viewsh.cxx | 2 ++
|
|
|
f325b2 |
1 file changed, 2 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
|
|
|
f325b2 |
index 093d5208fdda..e74a4a2514c8 100644
|
|
|
f325b2 |
--- a/sw/source/core/view/viewsh.cxx
|
|
|
f325b2 |
+++ b/sw/source/core/view/viewsh.cxx
|
|
|
f325b2 |
@@ -1886,6 +1886,8 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
|
|
|
f325b2 |
SwViewOption aOption(*GetViewOptions());
|
|
|
f325b2 |
aOption.SetZoom(fScale * 100);
|
|
|
f325b2 |
ApplyViewOptions(aOption);
|
|
|
f325b2 |
+ // Make sure the map mode (disabled in SwXTextDocument::initializeForTiledRendering()) is still disabled.
|
|
|
f325b2 |
+ GetWin()->EnableMapMode(false);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
Rectangle aOutRect = Rectangle(Point(tilePosX, tilePosY),
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|