|
 |
f325b2 |
From 2d49f2112eacd2e65405505ccabf8d6b8d4c94ab Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Wed, 11 Nov 2015 18:05:45 +0100
|
|
|
f325b2 |
Subject: [PATCH 304/398] sw lok: fix sidebarwindows::SwSidebarWin pixel
|
|
|
f325b2 |
position
|
|
|
f325b2 |
|
|
|
f325b2 |
So SwSidebarWin member functions don't get twip values when they call
|
|
|
f325b2 |
GetPosPixel().
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ied4ff7f49d0320766b045d78f731900af92d37ef
|
|
|
f325b2 |
(cherry picked from commit c4ef30ea916752ba5a057b49960a60a55f70c84c)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sw/source/uibase/docvw/PostItMgr.cxx | 11 +++++++++++
|
|
|
f325b2 |
1 file changed, 11 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
|
|
|
f325b2 |
index 2310dd64f4de..2a2e5d596056 100644
|
|
|
f325b2 |
--- a/sw/source/uibase/docvw/PostItMgr.cxx
|
|
|
f325b2 |
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
|
|
|
f325b2 |
@@ -593,6 +593,10 @@ void SwPostItMgr::PreparePageContainer()
|
|
|
f325b2 |
|
|
|
f325b2 |
void SwPostItMgr::LayoutPostIts()
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+ bool bEnableMapMode = comphelper::LibreOfficeKit::isActive() && !mpEditWin->IsMapModeEnabled();
|
|
|
f325b2 |
+ if (bEnableMapMode)
|
|
|
f325b2 |
+ mpEditWin->EnableMapMode();
|
|
|
f325b2 |
+
|
|
|
f325b2 |
if ( !mvPostItFields.empty() && !mbWaitingForCalcRects )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
mbLayouting = true;
|
|
|
f325b2 |
@@ -809,6 +813,9 @@ void SwPostItMgr::LayoutPostIts()
|
|
|
f325b2 |
|
|
|
f325b2 |
mbLayouting = false;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ if (bEnableMapMode)
|
|
|
f325b2 |
+ mpEditWin->EnableMapMode(false);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
bool SwPostItMgr::BorderOverPageBorder(unsigned long aPage) const
|
|
|
f325b2 |
@@ -856,6 +863,8 @@ void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const Rectangle& /*rRe
|
|
|
f325b2 |
if (!pPostIt)
|
|
|
f325b2 |
continue;
|
|
|
f325b2 |
|
|
|
f325b2 |
+ bool bEnableMapMode = !mpEditWin->IsMapModeEnabled();
|
|
|
f325b2 |
+ mpEditWin->EnableMapMode();
|
|
|
f325b2 |
rRenderContext.Push(PushFlags::MAPMODE);
|
|
|
f325b2 |
Point aOffset(mpEditWin->PixelToLogic(pPostIt->GetPosPixel()));
|
|
|
f325b2 |
MapMode aMapMode(rRenderContext.GetMapMode());
|
|
|
f325b2 |
@@ -867,6 +876,8 @@ void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const Rectangle& /*rRe
|
|
|
f325b2 |
pPostIt->PaintTile(rRenderContext, aRectangle);
|
|
|
f325b2 |
|
|
|
f325b2 |
rRenderContext.Pop();
|
|
|
f325b2 |
+ if (bEnableMapMode)
|
|
|
f325b2 |
+ mpEditWin->EnableMapMode(false);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|