|
 |
135360 |
From d2d19cf40a111c588489876038cb5e5c23908175 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
Date: Tue, 10 Nov 2015 20:08:49 +0100
|
|
|
135360 |
Subject: [PATCH 300/398] This PixelToLogic() call can be conditional in
|
|
|
135360 |
SwSidebarWin::SetPosAndSize()
|
|
|
135360 |
|
|
|
135360 |
It is only needed when tiled rendering.
|
|
|
135360 |
|
|
|
135360 |
Change-Id: Ie1668f5f3d4d17abc212e2262a6c155dcb855d2e
|
|
|
135360 |
(cherry picked from commit 88f4866803fc766503292252cb36af4a70ea98fd)
|
|
|
135360 |
---
|
|
|
135360 |
sw/source/uibase/docvw/SidebarWin.cxx | 14 +++++++-------
|
|
|
135360 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
135360 |
index 4975513ffc34..202a96767a39 100644
|
|
|
135360 |
--- a/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
135360 |
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
135360 |
@@ -608,15 +608,15 @@ void SwSidebarWin::SetPosAndSize()
|
|
|
135360 |
|
|
|
135360 |
// LOK has map mode disabled, and we still want to perform pixel ->
|
|
|
135360 |
// twips conversion for the size of the line above the note.
|
|
|
135360 |
- bool bEnableMapMode = comphelper::LibreOfficeKit::isActive() && !EditWin().IsMapModeEnabled();
|
|
|
135360 |
- if (bEnableMapMode)
|
|
|
135360 |
+ if (comphelper::LibreOfficeKit::isActive() && !EditWin().IsMapModeEnabled())
|
|
|
135360 |
+ {
|
|
|
135360 |
EditWin().EnableMapMode();
|
|
|
135360 |
- Size aSize(aLineEnd.getX() - aLineStart.getX(), aLineEnd.getY() - aLineStart.getY());
|
|
|
135360 |
- aSize = EditWin().PixelToLogic(aSize);
|
|
|
135360 |
- aLineEnd = aLineStart;
|
|
|
135360 |
- aLineEnd.Move(aSize.getWidth(), aSize.getHeight());
|
|
|
135360 |
- if (bEnableMapMode)
|
|
|
135360 |
+ Size aSize(aLineEnd.getX() - aLineStart.getX(), aLineEnd.getY() - aLineStart.getY());
|
|
|
135360 |
+ aSize = EditWin().PixelToLogic(aSize);
|
|
|
135360 |
+ aLineEnd = aLineStart;
|
|
|
135360 |
+ aLineEnd.Move(aSize.getWidth(), aSize.getHeight());
|
|
|
135360 |
EditWin().EnableMapMode(false);
|
|
|
135360 |
+ }
|
|
|
135360 |
|
|
|
135360 |
if (!IsPreview())
|
|
|
135360 |
{
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|