From 4e3073522acb657104585afa905959343093d127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Wed, 30 Mar 2005 09:30:31 +0000
Subject: [PATCH] INTEGRATION: CWS impress40 (1.4.76); FILE MERGED 2005/03/17
 11:22:03 cl 1.4.76.1: #i45157# fixed wizard preview

---
 sd/source/ui/slideshow/showwin.cxx | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 601f6ebe1451..9dfc3b4a8b47 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: showwin.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-01-27 14:17:12 $
+ *  last change: $Author: rt $ $Date: 2005-03-30 10:30:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,6 +72,10 @@
 
 #include "res_bmp.hrc"
 
+#ifndef _SD_SLIDESHOW_HXX
+#include "slideshow.hxx"
+#endif
+
 #ifndef SD_VIEW_SHELL_BASE_HXX
 #include "ViewShellBase.hxx"
 #endif
@@ -95,7 +99,8 @@ ShowWindow::ShowWindow( ::Window* pParent )
     meShowWindowMode(SHOWWINDOWMODE_NORMAL),
     mnRestartPageIndex( PAGE_NO_END ),
     mnPauseTimeout( SLIDE_NO_TIMEOUT ),
-    mbShowNavigatorAfterSpecialMode( FALSE )
+    mbShowNavigatorAfterSpecialMode( FALSE ),
+    mpSlideshow(0)
 {
     // Do never mirror the preview window.  This explicitly includes right
     // to left writing environments.
@@ -291,13 +296,20 @@ void ShowWindow::Paint(const Rectangle& rRect)
 
         SetClipRegion( aOldClipRegion );
 */
-        if(mpViewShell )
+        if( mpSlideshow )
         {
-            Slideshow* pSlideShow = mpViewShell->GetSlideShow();
-            if( pSlideShow )
-                pSlideShow->paint(rRect);
-            else
-                mpViewShell->Paint(rRect, this);
+            mpSlideshow->paint(rRect);
+        }
+        else
+        {
+            if(mpViewShell )
+            {
+                Slideshow* pSlideShow = mpViewShell->GetSlideShow();
+                if( pSlideShow )
+                    pSlideShow->paint(rRect);
+                else
+                    mpViewShell->Paint(rRect, this);
+            }
         }
     }
     else