diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-11 18:05:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-11 18:05:45 +0100 |
| commit | c4ef30ea916752ba5a057b49960a60a55f70c84c (patch) | |
| tree | 0d563da09d3ff776dac7728653a66026dbbc6310 /sw | |
| parent | bb34de0189a7c2ac81c08f3a283a71c2e67093d3 (diff) | |
sw lok: fix sidebarwindows::SwSidebarWin pixel position
So SwSidebarWin member functions don't get twip values when they call
GetPosPixel().
Change-Id: Ied4ff7f49d0320766b045d78f731900af92d37ef
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 1abe5c40470c..b0f62a09a27b 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); } } |