diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:44:54 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:44:54 +0000 |
commit | 135612dbd1e80cb1db7c7e2f6fce61d707b47063 (patch) | |
tree | e610e5e6f933cd84bb16c5d3938f46a353cecaeb /slideshow/source/engine/activities | |
parent | 237bec15854a8615b6f1705fecd3ac176f57ea00 (diff) |
INTEGRATION: CWS presfixes12 (1.5.12); FILE MERGED
2007/01/29 14:01:58 thb 1.5.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
Diffstat (limited to 'slideshow/source/engine/activities')
-rw-r--r-- | slideshow/source/engine/activities/continuousactivitybase.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/slideshow/source/engine/activities/continuousactivitybase.hxx b/slideshow/source/engine/activities/continuousactivitybase.hxx index e417dd36abc3..af14265539c0 100644 --- a/slideshow/source/engine/activities/continuousactivitybase.hxx +++ b/slideshow/source/engine/activities/continuousactivitybase.hxx @@ -4,9 +4,9 @@ * * $RCSfile: continuousactivitybase.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2006-12-13 15:25:50 $ + * last change: $Author: obo $ $Date: 2007-07-17 14:44:54 $ * * 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_CONTINUOUSACTIVITYBASE_HXX -#define _SLIDESHOW_CONTINUOUSACTIVITYBASE_HXX +#ifndef INCLUDED_SLIDESHOW_CONTINUOUSACTIVITYBASE_HXX +#define INCLUDED_SLIDESHOW_CONTINUOUSACTIVITYBASE_HXX -#include <simplecontinuousactivitybase.hxx> +#include "simplecontinuousactivitybase.hxx" namespace slideshow { @@ -78,4 +78,4 @@ namespace slideshow } } -#endif /* _SLIDESHOW_CONTINUOUSACTIVITYBASE_HXX */ +#endif /* INCLUDED_SLIDESHOW_CONTINUOUSACTIVITYBASE_HXX */ |