diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-17 08:41:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-17 08:41:46 +0100 |
| commit | fede08ac7d8b9d6c0abd2ba1b09fd3beb1c1b7e7 (patch) | |
| tree | d75b8c7e236fc3cdb25845dddd6c2955f3cfa13d | |
| parent | 4211ce7c62677c65dfbbb3602be6c36fd0f98977 (diff) | |
Related: fdo#36815 print the text highlight range as well
Change-Id: Ic332b1968b5dc72d26bd704cce70a496ec81e0b8
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/uibase/docvw/SidebarWin.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index a5cbf3bf3665..eb3133a39f98 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 ef6d4d35faf1..ac6cf3a04a0d 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; } |