diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-22 14:16:02 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-22 14:16:02 +0000 |
| commit | f4b795e8e03c9b5b1fddffc654c2c94da29883f7 (patch) | |
| tree | 5599abefbb5a8768ad09947ebf9ece83768cfa6c | |
| parent | 045d5da1d857a63acd7ff687429a3b1f9961e675 (diff) | |
INTEGRATION: CWS aw039 (1.3.12); FILE MERGED
2007/01/03 15:38:36 aw 1.3.12.1: #i72889# support IsPagePaintingAllowed flag, three step complete repaint
| -rw-r--r-- | svx/source/svdraw/sdrpagewindow.cxx | 10 | ||||
| -rw-r--r-- | svx/source/svdraw/sdrpaintwindow.cxx | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index b3fba84abe..9af993e180 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrpagewindow.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2006-12-05 12:13:36 $ + * last change: $Author: obo $ $Date: 2007-01-22 15:15:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -315,7 +315,7 @@ void SdrPageWindow::PrepareRedraw(const Region& rReg) aDisplayInfo.SetRedrawArea(rReg); // no PagePainting for preparations - aDisplayInfo.SetPagePainting(sal_False); + aDisplayInfo.SetPagePainting(rView.IsPagePaintingAllowed()); // #i72889# // keep draw hierarchy up-to-date and expand ClipRegion GetObjectContact().PreProcessDisplay(aDisplayInfo); @@ -490,7 +490,7 @@ void SdrPageWindow::RedrawAll(sal_uInt16 nPaintMode, ::sdr::contact::ViewObjectC aDisplayInfo.SetRedrawArea(rRegion); // Draw/Impress - aDisplayInfo.SetPagePainting(sal_True); + aDisplayInfo.SetPagePainting(rView.IsPagePaintingAllowed()); // #i72889# // paint page GetObjectContact().ProcessDisplay(aDisplayInfo); @@ -571,7 +571,7 @@ void SdrPageWindow::RedrawLayer( aDisplayInfo.SetRedrawArea(rRegion); // Writer or calc, coming from original RedrawOneLayer. - aDisplayInfo.SetPagePainting(sal_False); + aDisplayInfo.SetPagePainting(sal_False); // #i72889# no page painting for layer painting // check for valid draw hierarchy if(!GetObjectContact().IsDrawHierarchyValid()) diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 431ebc9990..f1a1fbedce 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrpaintwindow.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2006-12-05 12:11:39 $ + * last change: $Author: obo $ $Date: 2007-01-22 15:16:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -162,7 +162,8 @@ SdrPaintWindow::SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut) : mrOutputDevice(rOut), mrPaintView(rNewPaintView), mpOverlayManager(0L), - mpPreRenderDevice(0L) + mpPreRenderDevice(0L), + mbTemporaryTarget(false) // #i72889# { } |