diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-24 15:42:08 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-07-28 09:41:34 +0000 |
| commit | b2c40908c05d0d526bfaee523895399ab88087f7 (patch) | |
| tree | 289d07792069530b6b63d4c3722a66901f28d84f /sw | |
| parent | d4d394731f23dfdde2d37f7ed6effae67df2e2bd (diff) | |
tdf#92914 SwPagePreviewLayout::_PaintSelectMarkAtPage: handle rendercontext
With this, the print preview window does not paint the selection
rectangle on opening directly anymore.
(cherry picked from commit 0c114151343cbe6853dd46833c42368d738afd8a)
Change-Id: Ie4d24dfc4d64c74b22dcd1476778f4eac6f4cd13
Reviewed-on: https://gerrit.libreoffice.org/17363
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/pagepreviewlayout.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/view/pagepreviewlayout.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index b6e8196ac99e..b81afd756b5d 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -215,7 +215,7 @@ private: @author OD */ - void _PaintSelectMarkAtPage( const PreviewPage* _aSelectedPreviewPage ) const; + void _PaintSelectMarkAtPage(vcl::RenderContext& rRenderContext, const PreviewPage* _aSelectedPreviewPage) const; public: /** constructor of <SwPagePreviewLayout> diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 2450450902ef..da9f1f141b9f 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -1120,7 +1120,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan if ( (*aPageIter)->pPage->GetPhyPageNum() == mnSelectedPageNum ) { - _PaintSelectMarkAtPage( (*aPageIter) ); + _PaintSelectMarkAtPage(rRenderContext, *aPageIter); } } @@ -1201,10 +1201,10 @@ void SwPagePreviewLayout::Repaint( const Rectangle& rInvalidCoreRect ) const OD 17.12.2002 #103492# */ -void SwPagePreviewLayout::_PaintSelectMarkAtPage( +void SwPagePreviewLayout::_PaintSelectMarkAtPage(vcl::RenderContext& rRenderContext, const PreviewPage* _aSelectedPreviewPage ) const { - OutputDevice* pOutputDev = mrParentViewShell.GetOut(); + OutputDevice* pOutputDev = &rRenderContext; MapMode aMapMode( pOutputDev->GetMapMode() ); // save mapping mode of output device MapMode aSavedMapMode = aMapMode; @@ -1268,12 +1268,12 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) // re-paint for current selected page in order to umark it. const PreviewPage* pOldSelectedPreviewPage = _GetPreviewPageByPageNum( nOldSelectedPageNum ); + OutputDevice* pOutputDev = mrParentViewShell.GetOut(); if ( pOldSelectedPreviewPage && pOldSelectedPreviewPage->bVisible ) { // OD 20.02.2003 #107369# - invalidate only areas of selection mark. SwRect aPageRect( pOldSelectedPreviewPage->aPreviewWinPos, pOldSelectedPreviewPage->aPageSize ); - OutputDevice* pOutputDev = mrParentViewShell.GetOut(); ::SwAlignRect( aPageRect, &mrParentViewShell, pOutputDev ); Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() ); // invalidate top mark line @@ -1297,7 +1297,7 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) // re-paint for new selected page in order to mark it. const PreviewPage* pNewSelectedPreviewPage = _GetPreviewPageByPageNum( _nSelectedPage ); if ( pNewSelectedPreviewPage && pNewSelectedPreviewPage->bVisible ) - _PaintSelectMarkAtPage( pNewSelectedPreviewPage ); + _PaintSelectMarkAtPage( *pOutputDev, pNewSelectedPreviewPage ); } // helper methods |