INTEGRATION: CWS presenterview (1.26.52); FILE MERGED

2008/01/09 18:28:27 cl 1.26.52.4: #i15900# slideshow api consolidation
2007/07/11 09:12:52 af 1.26.52.3: RESYNC: (1.27-1.28); FILE MERGED
2007/04/19 16:10:32 af 1.26.52.2: RESYNC: (1.26-1.27); FILE MERGED
2007/03/12 14:17:03 af 1.26.52.1: #i75320# Moved code for starting a presentation to PresentationStarter.

1 files changed, 11 insertions, 32 deletions

diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index a71f1a3d546a..23146e8648a1 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: outlnvs2.cxx,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: kz $ $Date: 2007-05-10 15:36:08 $
+ *  last change: $Author: kz $ $Date: 2008-04-03 15:19:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,6 +38,8 @@
 
 #include "OutlineViewShell.hxx"
 
+#include <com/sun/star/presentation/XPresentation2.hpp>
+
 #include "app.hrc"
 #ifndef _SVX_HLNKITEM_HXX
 #include <svx/hlnkitem.hxx>
@@ -138,11 +140,12 @@
 #ifndef SD_VIEW_SHELL_BASE_HXX
 #include "ViewShellBase.hxx"
 #endif
-#ifndef SD_PRESENTATION_VIEW_SHELL_HXX
-#include "PresentationViewShell.hxx"
-#endif
 #include "sdabstdlg.hxx"
 #include "framework/FrameworkHelper.hxx"
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::presentation;
+
 namespace sd {
 
 
@@ -298,33 +301,9 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
         {
             pOlView->PrepareClose();
 
-            SFX_REQUEST_ARG( rReq, pFullScreen, SfxBoolItem, ATTR_PRESENT_FULLSCREEN, FALSE );
-            const BOOL bFullScreen = pFullScreen ? pFullScreen->GetValue() : GetDoc()->getPresentationSettings().mbFullScreen;
-
-            if( bFullScreen )
-            {
-                PresentationViewShell::CreateFullScreenShow( this, rReq );
-                Cancel();
-            }
-            else
-            {
-                mpFrameView->SetPresentationViewShellId (SID_VIEWSHELL2);
-                mpFrameView->SetSlotId (SID_PRESENTATION);
-                mpFrameView->SetPageKind (PK_STANDARD);
-                mpFrameView->SetPreviousViewShellType (GetShellType());
-
-                // Switch to an Impress view shell which shows the
-                // presentation in a window.  Switching to a presentation
-                // view shell is an error here, because this would not
-                // return to us (re-create us).
-                framework::FrameworkHelper::Instance(GetViewShellBase())->RequestView(
-                    framework::FrameworkHelper::msImpressViewURL,
-                    framework::FrameworkHelper::msCenterPaneURL);
-                framework::FrameworkHelper::Instance(GetViewShellBase())->RunOnConfigurationEvent(
-                    framework::FrameworkHelper::msConfigurationUpdateEndEvent,
-                    framework::DispatchCaller(*GetViewFrame()->GetDispatcher(), nSId));
-            }
-
+            Reference< XPresentation2 > xPresentation( GetDoc()->getPresentation() );
+            if( xPresentation.is() )
+                xPresentation->start();
             rReq.Done();
         }
         break;