diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:50:35 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:50:35 +0000 |
| commit | 0480f96ad0b0b5e3e4f501b5327212e0b3c49b4d (patch) | |
| tree | fd42c566cbbaa1671978ae7a3b92255431beb61b /slideshow/source/inc/activity.hxx | |
| parent | 5872362fd0218640c47cf191208e084e534471af (diff) | |
INTEGRATION: CWS presfixes09 (1.5.16); FILE MERGED
2006/03/24 18:23:29 thb 1.5.16.3: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
2006/03/15 15:22:21 thb 1.5.16.2: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)
2006/03/06 22:14:32 thb 1.5.16.1: #i53194# #i55294# #i59324# Overhauled IntrinsicAnimationActivity; fixes GIF animation import; corrected rehearse timings sprite size; several cosmetic changes (removed external header guards); prepared scene for sprite prio
Diffstat (limited to 'slideshow/source/inc/activity.hxx')
| -rw-r--r-- | slideshow/source/inc/activity.hxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/slideshow/source/inc/activity.hxx b/slideshow/source/inc/activity.hxx index af902fe38018..ec346a1bc853 100644 --- a/slideshow/source/inc/activity.hxx +++ b/slideshow/source/inc/activity.hxx @@ -4,9 +4,9 @@ * * $RCSfile: activity.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2005-10-11 08:47:15 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:50:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,20 +36,16 @@ #ifndef _SLIDESHOW_ACTIVITY_HXX #define _SLIDESHOW_ACTIVITY_HXX -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <disposable.hxx> /* Definition of Activity interface */ -namespace presentation +namespace slideshow { namespace internal { |