diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-09-03 16:52:47 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-09-04 12:59:52 +0200 |
| commit | 8af09bf33291df2fb2bfbbd6e42f9bf074fcc4fc (patch) | |
| tree | b3dc3e1739f7c006d7c9d21cf30acf76da95950c /sw | |
| parent | e598ab04476a32a08f18e8f0662fafa5f78f1a4a (diff) | |
n#777699: Clip the objects to the pagewe are painting
Change-Id: I78ac7de5346a2adea9a2c6cf3cbb0321e05d79dc
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/view/vdraw.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index ba26ae14f07b..0af0b447774f 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3122,7 +3122,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess(); pSh->Imp()->PaintLayer( pIDDMA->GetHellId(), pPrintData, - aPaintRect, + pPage->Frm(), &aPageBackgrdColor, (pPage->IsRightToLeft() ? true : false), &aSwRedirector ); @@ -3166,7 +3166,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const // OD 09.12.2002 #103045# - add 4th parameter for horizontal text direction. pSh->Imp()->PaintLayer( pSh->GetDoc()->GetHeavenId(), pPrintData, - aPaintRect, + pPage->Frm(), &aPageBackgrdColor, (pPage->IsRightToLeft() ? true : false), &aSwRedirector ); diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 69eb0a336cc2..d38065241422 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -97,7 +97,7 @@ void SwViewImp::UnlockPaint() void SwViewImp::PaintLayer( const SdrLayerID _nLayerID, SwPrintData const*const pPrintData, - const SwRect& , + const SwRect& aPaintRect, const Color* _pPageBackgrdColor, const bool _bIsPageRightToLeft, sdr::contact::ViewObjectContactRedirector* pRedirector ) const @@ -150,7 +150,7 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID, SdrView &rSdrView = const_cast< SdrView & >(GetPageView()->GetView()); rSdrView.setHideDraw( !pPrintData->IsPrintDraw() ); } - GetPageView()->DrawLayer( _nLayerID, pOutDev, pRedirector ); + GetPageView()->DrawLayer( _nLayerID, pOutDev, pRedirector, aPaintRect.SVRect() ); pOutDev->Pop(); // reset background color of the outliner & default horiz. text dir. |