summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2012-09-03 16:52:47 +0200
committerCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2012-10-02 17:48:27 +0200
commita023fd1367931a15e650d3c9ecba9623636ed666 (patch)
treee973ab44f1987b42104adb69ebf73f165f77a75b /sw/source/core
parenta9ebdd0e3464feeea6c22ab5a84c32c1ec71e490 (diff)
n#777699: Clip the objects to the pagewe are painting
Change-Id: I78ac7de5346a2adea9a2c6cf3cbb0321e05d79dc
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/layout/paintfrm.cxx4
-rw-r--r--sw/source/core/view/vdraw.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 39db5389a6b5..ddf071180211 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3129,7 +3129,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 );
@@ -3176,7 +3176,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 8139e2ad775c..5174e1a5e1f0 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -166,7 +166,7 @@ void SwViewImp::UnlockPaint()
// OD 25.06.2003 #108784# - correct type of 1st parameter
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
@@ -219,7 +219,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();
// OD 29.08.2002 #102450#