From 4173095a2092a7869a38d13d91e777592a2c900a Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 17 Jul 2007 14:06:59 +0000
Subject: INTEGRATION: CWS presfixes12 (1.4.12); FILE MERGED 2007/01/29
 14:02:22 thb 1.4.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
---
 slideshow/source/inc/eventhandler.hxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'slideshow/source/inc/eventhandler.hxx')

diff --git a/slideshow/source/inc/eventhandler.hxx b/slideshow/source/inc/eventhandler.hxx
index e6f8a6acdc73..4934c7a81a72 100644
--- a/slideshow/source/inc/eventhandler.hxx
+++ b/slideshow/source/inc/eventhandler.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: eventhandler.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-13 15:56:15 $
+ *  last change: $Author: obo $ $Date: 2007-07-17 15:06:22 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,13 +33,11 @@
  *
  ************************************************************************/
 
-#ifndef _SLIDESHOW_EVENTHANDLER_HXX
-#define _SLIDESHOW_EVENTHANDLER_HXX
+#ifndef INCLUDED_SLIDESHOW_EVENTHANDLER_HXX
+#define INCLUDED_SLIDESHOW_EVENTHANDLER_HXX
 
 #include <boost/shared_ptr.hpp>
 
-#include <disposable.hxx>
-
 
 /* Definition of EventHandler interface */
 
@@ -54,9 +52,11 @@ namespace slideshow
             EventMultiplexer object, and are called from there to
             handle events.
          */
-        class EventHandler : public Disposable
+        class EventHandler
         {
         public:
+            virtual ~EventHandler() {}
+
             /** Handle the event.
 
                 @return true, if this handler has successfully
@@ -72,4 +72,4 @@ namespace slideshow
     }
 }
 
-#endif /* _SLIDESHOW_EVENTHANDLER_HXX */
+#endif /* INCLUDED_SLIDESHOW_EVENTHANDLER_HXX */
-- 
cgit