diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:01:29 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:01:29 +0000 |
commit | 44cd272cd77d7c0bb53c4ea50a84035a8e008099 (patch) | |
tree | 4c303eece5b20e5b0f01994654286564a218e6c7 /slideshow | |
parent | 3c7ccb75f434616804e482e32eee0506a163f43c (diff) |
INTEGRATION: CWS presfixes09 (1.5.16); FILE MERGED
2006/04/12 20:40:09 thb 1.5.16.4: #i37778# Replaced all shared_ptr.get() != NULL places with the more elegant automatic-conversion-to-bool version (at least where the compiler tolerated that)
2006/03/24 18:23:36 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:24 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:36 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')
-rw-r--r-- | slideshow/source/inc/shapeattributelayer.hxx | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index 95a0bea8612a..e241d8677de3 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -4,9 +4,9 @@ * * $RCSfile: shapeattributelayer.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2005-10-11 08:53:06 $ + * last change: $Author: kz $ $Date: 2006-12-13 16:01:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,35 +36,17 @@ #ifndef _SLIDESHOW_SHAPEATTRIBUTELAYER_HXX #define _SLIDESHOW_SHAPEATTRIBUTELAYER_HXX -#ifndef _COM_SUN_STAR_UTIL_TRISTATE_HPP_ #include <com/sun/star/util/TriState.hpp> -#endif -#ifndef _COM_SUN_STAR_DRAWING_FILLSTYLE_HPP_ #include <com/sun/star/drawing/FillStyle.hpp> -#endif -#ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ #include <com/sun/star/drawing/LineStyle.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTSLANT_HPP_ #include <com/sun/star/awt/FontSlant.hpp> -#endif -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif -#ifndef _BGFX_VECTOR_B2DSIZE_HXX #include <basegfx/vector/b2dsize.hxx> -#endif -#ifndef _BGFX_POINT_B2DPOINT_HXX #include <basegfx/point/b2dpoint.hxx> -#endif -#ifndef _BGFX_RANGE_B2DRECTANGLE_HXX #include <basegfx/range/b2drectangle.hxx> -#endif -#ifndef _BGFX_POLYGON_B2DPOLYPOLYGON_HXX #include <basegfx/polygon/b2dpolypolygon.hxx> -#endif #include <stack> @@ -72,7 +54,7 @@ #include <rgbcolor.hxx> -namespace presentation +namespace slideshow { namespace internal { @@ -502,7 +484,7 @@ namespace presentation // ShapeAttributeLayer(const ShapeAttributeLayer&); // ShapeAttributeLayer& operator=( const ShapeAttributeLayer& ); - bool haveChild() const { return mpChild.get() != NULL; } + bool haveChild() const { return mpChild; } void updateStateIds(); template< typename T > T calcValue( const T& rCurrValue, |