sw/source/core/layout/paintfrm.cxx | 2 +-
sw/source/core/uibase/docvw/SidebarWin.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit fede08ac7d8b9d6c0abd2ba1b09fd3beb1c1b7e7
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Apr 17 08:41:07 2014 +0100
Related: fdo#36815 print the text highlight range as well
Change-Id: Ic332b1968b5dc72d26bd704cce70a496ec81e0b8
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index a5cbf3b..eb3133a 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6172,7 +6172,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut,
const Point& aPoint, con
SwAlignRect( aPageRect, _pViewShell );
const SwPostItMgr *pMgr = _pViewShell->GetPostItMgr();
- if (pMgr /*&& pMgr->ShowNotes()*/ && pMgr->HasNotes()) // do not show
anything in print preview
+ if (pMgr && pMgr->ShowNotes() && pMgr->HasNotes()) // do not show
anything in print preview
{
sal_Int32 nScrollerHeight = pMgr->GetSidebarScrollerHeight();
const Rectangle &aVisRect = _pViewShell->VisArea().SVRect();
diff --git a/sw/source/core/uibase/docvw/SidebarWin.cxx
b/sw/source/core/uibase/docvw/SidebarWin.cxx
index ef6d4d3..ac6cf3a 100644
--- a/sw/source/core/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWin.cxx
@@ -269,13 +269,13 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point&
rPt, const Size& rSz, s
mpSidebarTxtControl->Draw(pDev, rPt, rSz, nInFlags);
- const drawinglayer::primitive2d::Primitive2DSequence& rSequence =
mpAnchor->getOverlayObjectPrimitive2DSequence();
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
drawinglayer::processor2d::BaseProcessor2D * pProcessor =
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
*pDev, aNewViewInfos );
- pProcessor->process(rSequence);
+ pProcessor->process(mpAnchor->getOverlayObjectPrimitive2DSequence());
+
pProcessor->process(mpTextRangeOverlay->getOverlayObjectPrimitive2DSequence());
delete pProcessor;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
