INTEGRATION: CWS presfixes09 (1.3.18); FILE MERGED

2006/04/03 16:19:04 thb 1.3.18.3: #i37778# Now passing down ComponentContext to all interested parties; building a second, all-exports version of the slideshow component (to facilitate unit testing also for internal classes) - this made necessary renaming ImportFailedException to ShapeLoadFailedException (because of silly i63703); applied relevant parts of #i63770# (const-correctness); reworked view handling in such a way that views are now kept in one central repository (and are not duplicated across all interested objects); moved code from namespace presentation to namespace slideshow
2006/03/24 18:23:38 thb 1.3.18.2: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
2006/03/15 15:22:24 thb 1.3.18.1: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)

1 files changed, 19 insertions, 18 deletions

diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx
index 0cb33cb36cc6..316185071cdf 100644
--- a/slideshow/source/inc/slideshowcontext.hxx
+++ b/slideshow/source/inc/slideshowcontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: slideshowcontext.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 21:20:34 $
+ *  last change: $Author: kz $ $Date: 2006-12-13 16:03:32 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,20 +36,18 @@
 #ifndef _SLIDESHOW_SLIDESHOWCONTEXT_HXX
 #define _SLIDESHOW_SLIDESHOWCONTEXT_HXX
 
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_
 #include <com/sun/star/uno/Reference.hxx>
-#endif
-#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HXX_
 #include <com/sun/star/uno/XComponentContext.hpp>
-#endif
 
-#include <layermanager.hxx>
-#include <eventqueue.hxx>
-#include <activitiesqueue.hxx>
-#include <usereventqueue.hxx>
+#include "layermanager.hxx"
+#include "eventqueue.hxx"
+#include "activitiesqueue.hxx"
+#include "usereventqueue.hxx"
+#include "eventmultiplexer.hxx"
+#include "unoviewcontainer.hxx"
 
 
-namespace presentation
+namespace slideshow
 {
     namespace internal
     {
@@ -77,26 +75,28 @@ namespace presentation
                 @param rUserEventQueue
                 User event queue
             */
-            SlideShowContext( const LayerManagerSharedPtr&                  rLayerManager,
-                              EventQueue&                                   rEventQueue,
-                              EventMultiplexer&                             rEventMultiplexer,
-                              ActivitiesQueue&                              rActivitiesQueue,
-                              UserEventQueue&                               rUserEventQueue,
+            SlideShowContext( const LayerManagerSharedPtr&                      rLayerManager,
+                              EventQueue&                                       rEventQueue,
+                              EventMultiplexer&                                 rEventMultiplexer,
+                              ActivitiesQueue&                                  rActivitiesQueue,
+                              UserEventQueue&                                   rUserEventQueue,
+                              const UnoViewContainer&                           rViewContainer,
                               const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::uno::XComponentContext>&    rComponentContext ) :
+                                    ::com::sun::star::uno::XComponentContext>&  rComponentContext ) :
                 mpLayerManager( rLayerManager ),
                 mrEventQueue( rEventQueue ),
                 mrEventMultiplexer( rEventMultiplexer ),
                 mrActivitiesQueue( rActivitiesQueue ),
                 mrUserEventQueue( rUserEventQueue ),
+                mrViewContainer( rViewContainer ),
                 mxComponentContext( rComponentContext )
             {
             }
 
             void dispose()
             {
-                mpLayerManager.reset();
                 mxComponentContext.clear();
+                mpLayerManager.reset();
             }
 
             LayerManagerSharedPtr                           mpLayerManager;
@@ -104,6 +104,7 @@ namespace presentation
             EventMultiplexer&                               mrEventMultiplexer;
             ActivitiesQueue&                                mrActivitiesQueue;
             UserEventQueue&                                 mrUserEventQueue;
+            const UnoViewContainer&                         mrViewContainer;
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::uno::XComponentContext>   mxComponentContext;
         };