INTEGRATION: CWS presfixes12 (1.6.12); FILE MERGED

2007/03/05 13:47:13 thb 1.6.12.2: #i37778# Removed Activity::needsScreenUpdate() method - this is now handled by notifying ScreenUpdater explicitely; reorg of SlideShowImpl members, to align lifetime with mutual references; fixed (hopefully) last repaint issues with new LayerManager; added more tests
2007/01/29 14:02:18 thb 1.6.12.1: Issue number: #i37778#

Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax

1 files changed, 6 insertions, 17 deletions

diff --git a/slideshow/source/inc/activity.hxx b/slideshow/source/inc/activity.hxx
index ec346a1bc853..1c8f84151b69 100644
--- a/slideshow/source/inc/activity.hxx
+++ b/slideshow/source/inc/activity.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: activity.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-13 15:50:35 $
+ *  last change: $Author: obo $ $Date: 2007-07-17 15:01:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,14 +33,14 @@
  *
  ************************************************************************/
 
-#ifndef _SLIDESHOW_ACTIVITY_HXX
-#define _SLIDESHOW_ACTIVITY_HXX
+#ifndef INCLUDED_SLIDESHOW_ACTIVITY_HXX
+#define INCLUDED_SLIDESHOW_ACTIVITY_HXX
 
 #include <sal/types.h>
 
 #include <boost/shared_ptr.hpp>
 
-#include <disposable.hxx>
+#include "disposable.hxx"
 
 
 /* Definition of Activity interface */
@@ -84,17 +84,6 @@ namespace slideshow
             */
             virtual bool isActive() const = 0;
 
-            /** Query whether this activity, while active, needs a
-                screen update after perform() calls.
-
-                A prominent example for activities that need screen
-                updates are animations.
-
-                @return true, if this activity, while active, needs a
-                screen update after perform() calls.
-             */
-            virtual bool needsScreenUpdate() const = 0;
-
             /** Notifies the Activity that it has now left the
                 ActivitiesQueue
 
@@ -116,4 +105,4 @@ namespace slideshow
     }
 }
 
-#endif /* _SLIDESHOW_ACTIVITY_HXX */
+#endif /* INCLUDED_SLIDESHOW_ACTIVITY_HXX */