diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-24 15:42:08 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-24 15:59:27 +0200 |
| commit | 0c114151343cbe6853dd46833c42368d738afd8a (patch) | |
| tree | 51bef1404b7a675fa10d346d82b6c22c94dbdd67 /sw/source | |
| parent | af162f1c37e8c909386e72e5d8b4ff6bccfd529b (diff) | |
tdf#92914 SwPagePreviewLayout::_PaintSelectMarkAtPage: handle rendercontext
With this, the print preview window does not paint the selection
rectangle on opening anymore.
Change-Id: Ie4d24dfc4d64c74b22dcd1476778f4eac6f4cd13
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/view/pagepreviewlayout.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index a24a5ed9c884..44dc5fe6c634 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -1122,7 +1122,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan if ( (*aPageIter)->pPage->GetPhyPageNum() == mnSelectedPageNum ) { - _PaintSelectMarkAtPage( (*aPageIter) ); + _PaintSelectMarkAtPage(rRenderContext, *aPageIter); } } @@ -1203,10 +1203,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; @@ -1270,12 +1270,12 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) // re-paint for current selected page in order to unmark 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 @@ -1299,7 +1299,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 |