INTEGRATION: CWS aw024 (1.14.86); FILE MERGED

2006/09/21 23:03:44 aw 1.14.86.8: RESYNC: (1.17-1.18); FILE MERGED
2006/02/01 20:36:03 aw 1.14.86.7: adaption to m154 after resync
2006/01/26 19:47:49 aw 1.14.86.6: RESYNC: (1.16-1.17); FILE MERGED
2005/09/17 11:07:09 aw 1.14.86.5: RESYNC: (1.15-1.16); FILE MERGED
2005/05/26 11:24:28 aw 1.14.86.4: #i39531#
2005/05/19 12:11:22 aw 1.14.86.3: #i39529#
2005/05/13 14:26:11 aw 1.14.86.2: RESYNC: (1.14-1.15); FILE MERGED
2005/05/12 16:46:21 aw 1.14.86.1: #i39529#

1 files changed, 13 insertions, 14 deletions

diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index ac9abf78de29..fee91dd90d72 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: docprev.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 18:38:32 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 14:25:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -95,12 +95,14 @@
 #endif
 #include "sdpage.hxx"
 
-#include <memory>
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
 
+#include <memory>
 
 using ::com::sun::star::drawing::XDrawPage;
 using ::com::sun::star::animations::XAnimationNode;
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
@@ -319,7 +321,7 @@ void SdDocPreviewWin::updateViewSettings()
 
             pView->SetBordVisible( FALSE );
             pView->SetPageVisible( FALSE );
-            pView->ShowPage( pPage, Point() );
+            pView->ShowSdrPage( pPage );
 
             const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() );
             const Size aNewSize( aSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(),
@@ -327,21 +329,18 @@ void SdDocPreviewWin::updateViewSettings()
             const Rectangle aClipRect( aNewOrg, aNewSize );
             MapMode         aVMap( aMap );
 
-            SdrPageView* pPageView  = pView->GetPageView( pPage );
+            SdrPageView* pPageView  = pView->GetSdrPageView();
 
             aVDev.Push();
             aVMap.SetOrigin( Point( -aNewOrg.X(), -aNewOrg.Y() ) );
             aVDev.SetRelativeMapMode( aVMap );
             aVDev.IntersectClipRegion( aClipRect );
 
-            // Use new StandardCheckVisisbilityRedirector
-            StandardCheckVisisbilityRedirector aRedirector;
-
-            for (USHORT i=0; i<pView->GetPageViewCount(); i++)
-            {
-                SdrPageView* pPV=pView->GetPageViewPvNum(i);
-                pPV->CompleteRedraw(&aVDev, Region(Rectangle(Point(), aNewSize)), 0, &aRedirector);
-            }
+        // Use new StandardCheckVisisbilityRedirector
+        StandardCheckVisisbilityRedirector aRedirector;
+        const Rectangle aRedrawRectangle( Point(), aNewSize );
+        Region aRedrawRegion(aRedrawRectangle);
+        pView->SdrPaintView::CompleteRedraw(&aVDev,aRedrawRegion,0,&aRedirector);
 
             aVDev.Pop();