INTEGRATION: CWS impress34 (1.22.18); FILE MERGED

2005/02/11 12:28:22 bm 1.22.18.2: #i41824# next try, now Linux works again ...
2005/02/11 11:18:20 bm 1.22.18.1: i41824# apply new slideshow to mpSlideShow before calling startShow, for resizes being properly forwarded

1 files changed, 12 insertions, 11 deletions

diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 14a8f48ea2a2..ecf7bb01d3f0 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: presvish.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: rt $ $Date: 2005-02-07 16:14:01 $
+ *  last change: $Author: vg $ $Date: 2005-02-24 15:09:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,8 +109,6 @@
 using namespace sd;
 #include "sdslots.hxx"
 
-#include <memory>
-
 
 namespace sd {
 
@@ -224,20 +222,23 @@ void PresentationViewShell::FinishInitialization (
     SfxUInt16Item aId (SID_CONFIGITEMID, SID_NAVIGATOR);
     GetViewFrame()->GetDispatcher()->Execute(
         SID_SHOWPOPUPS, SFX_CALLMODE_SYNCHRON, &aShowItem, &aId, 0L );
-    GetViewFrame()->Show();
 
-    std::auto_ptr<Slideshow> pSlideShow(
-        new sd::Slideshow( this, GetView(), GetDoc() ) );
-    pSlideShow->setRehearseTimings(
+    mpSlideShow = new sd::Slideshow( this, GetView(), GetDoc() );
+    mpSlideShow->setRehearseTimings(
         rRequest.GetSlot() == SID_REHEARSE_TIMINGS );
     GetActiveWindow()->GrabFocus();
 
     // Start the show.
-    if (pSlideShow->startShow(0)) {
-        mpSlideShow = pSlideShow.release();
+    if (mpSlideShow->startShow(0))
         mbShowStarted = sal_True;
+    else
+    {
+        delete mpSlideShow;
+        mpSlideShow = 0;
     }
 
+    GetViewFrame()->Show();
+
     Activate(TRUE);
 }
 
@@ -347,7 +348,7 @@ void PresentationViewShell::CreateFullScreenShow (
             if (pCurrentPage != NULL)
                 nStartPage = (pCurrentPage->GetPageNum() - 1) / 2;
 
-            pBase->GetViewFrame()->Show();
+//            pBase->GetViewFrame()->Show();
             // The following GrabFocus() is responsible for activating the
             // new view shell.  Without it the screen remains blank (under
             // Windows and some Linux variants.)