summaryrefslogtreecommitdiffstats
path: root/slideshow/source/inc/disposable.hxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-07-17 14:05:17 +0000
committerOliver Bolte <obo@openoffice.org>2007-07-17 14:05:17 +0000
commitfc0bca4b58a93743f4b2f0813ba9ba293161da0f (patch)
treef9353c4ae7eecba7281a282cefd18eea4eac6f4e /slideshow/source/inc/disposable.hxx
parentINTEGRATION: CWS presfixes12 (1.6.12); FILE MERGED (diff)
downloadcore-fc0bca4b58a93743f4b2f0813ba9ba293161da0f.tar.gz
core-fc0bca4b58a93743f4b2f0813ba9ba293161da0f.zip
INTEGRATION: CWS presfixes12 (1.4.12); FILE MERGED
2007/01/29 14:02:21 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
Diffstat (limited to 'slideshow/source/inc/disposable.hxx')
-rw-r--r--slideshow/source/inc/disposable.hxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/slideshow/source/inc/disposable.hxx b/slideshow/source/inc/disposable.hxx
index 8d78a9c6b8b2..a19485fce992 100644
--- a/slideshow/source/inc/disposable.hxx
+++ b/slideshow/source/inc/disposable.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: disposable.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: kz $ $Date: 2006-12-13 15:54:30 $
+ * last change: $Author: obo $ $Date: 2007-07-17 15:04:47 $
*
* 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_DISPOSABLE_HXX
-#define _SLIDESHOW_DISPOSABLE_HXX
+#ifndef INCLUDED_SLIDESHOW_DISPOSABLE_HXX
+#define INCLUDED_SLIDESHOW_DISPOSABLE_HXX
#include <sal/types.h>
-
#include <boost/shared_ptr.hpp>
@@ -71,4 +70,4 @@ namespace slideshow
}
}
-#endif /* _SLIDESHOW_DISPOSABLE_HXX */
+#endif /* INCLUDED_SLIDESHOW_DISPOSABLE_HXX */