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