diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:07:55 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:07:55 +0000 |
commit | 45aa040682a455d0cfe363cf0e56c26cc76bd63f (patch) | |
tree | cd3cdc8025bc8a7160e5b4c2020f96967d3bc761 /slideshow | |
parent | 9f0bf83a0c63794ee0432c27d3fb2d5b3735615e (diff) |
INTEGRATION: CWS presfixes09 (1.3.18); FILE MERGED
2006/03/24 18:23:40 thb 1.3.18.3: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
2006/03/15 15:22:26 thb 1.3.18.2: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)
2006/03/06 22:14:38 thb 1.3.18.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')
-rw-r--r-- | slideshow/source/inc/viewlayer.hxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx index 1b319e8bbc1c..7e0b9053dd23 100644 --- a/slideshow/source/inc/viewlayer.hxx +++ b/slideshow/source/inc/viewlayer.hxx @@ -4,9 +4,9 @@ * * $RCSfile: viewlayer.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 21:25:12 $ + * last change: $Author: kz $ $Date: 2006-12-13 16:07:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,22 +36,18 @@ #ifndef _SLIDESHOW_VIEWLAYER_HXX #define _SLIDESHOW_VIEWLAYER_HXX -#ifndef _CPPCANVAS_SPRITECANVAS_HXX #include <cppcanvas/spritecanvas.hxx> -#endif -#ifndef _BGFX_RANGE_B2IRECTANGLE_HXX #include <basegfx/range/b2irectangle.hxx> -#endif -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif + +namespace basegfx { class B1DRange; class B2DRange; } /* Definition of ViewLayer interface */ -namespace presentation +namespace slideshow { namespace internal { |