diff --git a/0001-Related-fdo-36815-print-the-text-highlight-range-as-.patch b/0001-Related-fdo-36815-print-the-text-highlight-range-as-.patch new file mode 100644 index 0000000..faddcca --- /dev/null +++ b/0001-Related-fdo-36815-print-the-text-highlight-range-as-.patch @@ -0,0 +1,47 @@ +From fede08ac7d8b9d6c0abd2ba1b09fd3beb1c1b7e7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 17 Apr 2014 08:41:07 +0100 +Subject: [PATCH] Related: fdo#36815 print the text highlight range as well + +Change-Id: Ic332b1968b5dc72d26bd704cce70a496ec81e0b8 +--- + sw/source/core/layout/paintfrm.cxx | 2 +- + 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 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/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx +index ef6d4d3..ac6cf3a 100644 +--- a/sw/source/ui/docvw/SidebarWin.cxx ++++ b/sw/source/ui/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; + } + +-- +1.9.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 37c77ec..9acb5f0 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -296,6 +296,7 @@ Patch31: 0001-prevent-KDE-Qt-from-interfering-with-the-session-man.patch Patch32: 0001-fix-libetonyek-build.patch %endif Patch33: 0001-Resolves-fdo-36815-enable-printing-WYSIWYG-sidewindo.patch +Patch34: 0001-Related-fdo-36815-print-the-text-highlight-range-as-.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice