|
 |
0bd0c44 |
From fede08ac7d8b9d6c0abd2ba1b09fd3beb1c1b7e7 Mon Sep 17 00:00:00 2001
|
|
|
0bd0c44 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
0bd0c44 |
Date: Thu, 17 Apr 2014 08:41:07 +0100
|
|
|
0bd0c44 |
Subject: [PATCH] Related: fdo#36815 print the text highlight range as well
|
|
|
0bd0c44 |
|
|
|
0bd0c44 |
Change-Id: Ic332b1968b5dc72d26bd704cce70a496ec81e0b8
|
|
|
0bd0c44 |
---
|
|
|
0bd0c44 |
sw/source/core/layout/paintfrm.cxx | 2 +-
|
|
|
0bd0c44 |
sw/source/core/uibase/docvw/SidebarWin.cxx | 4 ++--
|
|
|
0bd0c44 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
0bd0c44 |
|
|
|
0bd0c44 |
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
|
|
|
0bd0c44 |
index a5cbf3b..eb3133a 100644
|
|
|
0bd0c44 |
--- a/sw/source/core/layout/paintfrm.cxx
|
|
|
0bd0c44 |
+++ b/sw/source/core/layout/paintfrm.cxx
|
|
|
0bd0c44 |
@@ -6172,7 +6172,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, const Point& aPoint, con
|
|
|
0bd0c44 |
SwAlignRect( aPageRect, _pViewShell );
|
|
|
0bd0c44 |
|
|
|
0bd0c44 |
const SwPostItMgr *pMgr = _pViewShell->GetPostItMgr();
|
|
|
0bd0c44 |
- if (pMgr /*&& pMgr->ShowNotes()*/ && pMgr->HasNotes()) // do not show anything in print preview
|
|
|
0bd0c44 |
+ if (pMgr && pMgr->ShowNotes() && pMgr->HasNotes()) // do not show anything in print preview
|
|
|
0bd0c44 |
{
|
|
|
0bd0c44 |
sal_Int32 nScrollerHeight = pMgr->GetSidebarScrollerHeight();
|
|
|
0bd0c44 |
const Rectangle &aVisRect = _pViewShell->VisArea().SVRect();
|
|
|
0bd0c44 |
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
|
|
|
0bd0c44 |
index ef6d4d3..ac6cf3a 100644
|
|
|
0bd0c44 |
--- a/sw/source/ui/docvw/SidebarWin.cxx
|
|
|
0bd0c44 |
+++ b/sw/source/ui/docvw/SidebarWin.cxx
|
|
|
0bd0c44 |
@@ -269,13 +269,13 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, s
|
|
|
0bd0c44 |
|
|
|
0bd0c44 |
mpSidebarTxtControl->Draw(pDev, rPt, rSz, nInFlags);
|
|
|
0bd0c44 |
|
|
|
0bd0c44 |
- const drawinglayer::primitive2d::Primitive2DSequence& rSequence = mpAnchor->getOverlayObjectPrimitive2DSequence();
|
|
|
0bd0c44 |
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
|
|
|
0bd0c44 |
drawinglayer::processor2d::BaseProcessor2D * pProcessor =
|
|
|
0bd0c44 |
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
|
|
|
0bd0c44 |
*pDev, aNewViewInfos );
|
|
|
0bd0c44 |
|
|
|
0bd0c44 |
- pProcessor->process(rSequence);
|
|
|
0bd0c44 |
+ pProcessor->process(mpAnchor->getOverlayObjectPrimitive2DSequence());
|
|
|
0bd0c44 |
+ pProcessor->process(mpTextRangeOverlay->getOverlayObjectPrimitive2DSequence());
|
|
|
0bd0c44 |
delete pProcessor;
|
|
|
0bd0c44 |
}
|
|
|
0bd0c44 |
|
|
|
0bd0c44 |
--
|
|
|
0bd0c44 |
1.9.0
|
|
|
0bd0c44 |
|