INTEGRATION: CWS presfixes12 (1.6.12); FILE MERGED

2007/01/29 14:01:59 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

3 files changed, 19 insertions, 20 deletions

diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
index 0890dfe61448..514fdb453bac 100644
--- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
+++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: continuouskeytimeactivitybase.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-13 15:26:18 $
+ *  last change: $Author: obo $ $Date: 2007-07-17 14:45:09 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,11 +33,10 @@
  *
  ************************************************************************/
 
-#ifndef _SLIDESHOW_CONTINUOUSKEYTIMEACTIVITYBASE_HXX
-#define _SLIDESHOW_CONTINUOUSKEYTIMEACTIVITYBASE_HXX
-
-#include <simplecontinuousactivitybase.hxx>
+#ifndef INCLUDED_SLIDESHOW_CONTINUOUSKEYTIMEACTIVITYBASE_HXX
+#define INCLUDED_SLIDESHOW_CONTINUOUSKEYTIMEACTIVITYBASE_HXX
 
+#include "simplecontinuousactivitybase.hxx"
 #include <vector>
 
 
@@ -90,4 +89,4 @@ namespace slideshow
     }
 }
 
-#endif /* _SLIDESHOW_CONTINUOUSKEYTIMEACTIVITYBASE_HXX */
+#endif /* INCLUDED_SLIDESHOW_CONTINUOUSKEYTIMEACTIVITYBASE_HXX */
diff --git a/slideshow/source/engine/activities/discreteactivitybase.hxx b/slideshow/source/engine/activities/discreteactivitybase.hxx
index ab2ce5663fd1..a438df640620 100644
--- a/slideshow/source/engine/activities/discreteactivitybase.hxx
+++ b/slideshow/source/engine/activities/discreteactivitybase.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: discreteactivitybase.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-13 15:27:00 $
+ *  last change: $Author: obo $ $Date: 2007-07-17 14:45:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,11 +33,11 @@
  *
  ************************************************************************/
 
-#ifndef _SLIDESHOW_DISCRETEACTIVITYBASE_HXX
-#define _SLIDESHOW_DISCRETEACTIVITYBASE_HXX
+#ifndef INCLUDED_SLIDESHOW_DISCRETEACTIVITYBASE_HXX
+#define INCLUDED_SLIDESHOW_DISCRETEACTIVITYBASE_HXX
 
-#include <activitybase.hxx>
-#include <wakeupevent.hxx>
+#include "activitybase.hxx"
+#include "wakeupevent.hxx"
 
 #include <vector>
 
@@ -92,4 +92,4 @@ namespace slideshow
     }
 }
 
-#endif /* _SLIDESHOW_DISCRETEACTIVITYBASE_HXX */
+#endif /* INCLUDED_SLIDESHOW_DISCRETEACTIVITYBASE_HXX */
diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
index 8b912816f2bd..3fe42ec242b6 100644
--- a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
+++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: simplecontinuousactivitybase.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-13 15:27:48 $
+ *  last change: $Author: obo $ $Date: 2007-07-17 14:46:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,10 +33,10 @@
  *
  ************************************************************************/
 
-#ifndef _SLIDESHOW_SIMPLECONTINUOUSACTIVITYBASE_HXX
-#define _SLIDESHOW_SIMPLECONTINUOUSACTIVITYBASE_HXX
+#ifndef INCLUDED_SLIDESHOW_SIMPLECONTINUOUSACTIVITYBASE_HXX
+#define INCLUDED_SLIDESHOW_SIMPLECONTINUOUSACTIVITYBASE_HXX
 
-#include <activitybase.hxx>
+#include "activitybase.hxx"
 #include <canvas/elapsedtime.hxx>
 
 namespace slideshow
@@ -92,4 +92,4 @@ namespace slideshow
     }
 }
 
-#endif /* _SLIDESHOW_SIMPLECONTINUOUSACTIVITYBASE_HXX */
+#endif /* INCLUDED_SLIDESHOW_SIMPLECONTINUOUSACTIVITYBASE_HXX */