diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:18:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:18:50 +0000 |
| commit | b40b8577cecdf9e1224c6e8da4032ccfcd6937d3 (patch) | |
| tree | 160d4eed31a15c746e368086e2b24295cc604230 | |
| parent | 9f3f2ace3310ba4f8dc2c66321adc3c373c8cfb3 (diff) | |
INTEGRATION: CWS presfixes09 (1.4.18); FILE MERGED
2006/10/18 19:50:21 thb 1.4.18.4: RESYNC: (1.4-1.6); FILE MERGED
2006/04/12 20:40:04 thb 1.4.18.3: #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:09 thb 1.4.18.2: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
2006/03/15 15:22:17 thb 1.4.18.1: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)
| -rw-r--r-- | slideshow/source/engine/shapeattributelayer.cxx | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx index dddf1fe66ea9..c6d4234866dc 100644 --- a/slideshow/source/engine/shapeattributelayer.cxx +++ b/slideshow/source/engine/shapeattributelayer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shapeattributelayer.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-10-12 13:55:15 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:18:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,41 +40,23 @@ #include <canvas/debug.hxx> #include <shapeattributelayer.hxx> -#ifndef _CANVAS_VERBOSETRACE_HXX #include <canvas/verbosetrace.hxx> -#endif -#ifndef _COM_SUN_STAR_AWT_RECTANGLE_HPP_ #include <com/sun/star/awt/Rectangle.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTUNDERLINE_HPP_ #include <com/sun/star/awt/FontUnderline.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_FONTWEIGHT_HPP_ #include <com/sun/star/awt/FontWeight.hpp> -#endif - -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif - -#ifndef _COM_SUN_STAR_ANIMATIONS_ANIMATIONADDITIVEMODE_HPP_ #include <com/sun/star/animations/AnimationAdditiveMode.hpp> -#endif -#ifndef _BGFX_NUMERIC_FTOOLS_HXX #include <basegfx/numeric/ftools.hxx> -#endif -#ifndef INCLUDED_RTL_MATH_HXX #include <rtl/math.hxx> -#endif using namespace ::com::sun::star; -namespace presentation +namespace slideshow { namespace internal { @@ -189,11 +171,11 @@ namespace presentation maLineColor(), maCharColor(), - mnTransformationState( rChildLayer.get() ? rChildLayer->getTransformationState() : 0 ), - mnClipState( rChildLayer.get() ? rChildLayer->getClipState() : 0), - mnAlphaState( rChildLayer.get() ? rChildLayer->getAlphaState() : 0), - mnPositionState( rChildLayer.get() ? rChildLayer->getPositionState() : 0 ), - mnContentState( rChildLayer.get() ? rChildLayer->getContentState() : 0 ), + mnTransformationState( rChildLayer ? rChildLayer->getTransformationState() : 0 ), + mnClipState( rChildLayer ? rChildLayer->getClipState() : 0), + mnAlphaState( rChildLayer ? rChildLayer->getAlphaState() : 0), + mnPositionState( rChildLayer ? rChildLayer->getPositionState() : 0 ), + mnContentState( rChildLayer ? rChildLayer->getContentState() : 0 ), mnAdditiveMode( animations::AnimationAdditiveMode::BASE ), @@ -232,7 +214,7 @@ namespace presentation bool ShapeAttributeLayer::revokeChildLayer( const ShapeAttributeLayerSharedPtr& rChildLayer ) { - ENSURE_AND_RETURN( rChildLayer.get(), + ENSURE_AND_RETURN( rChildLayer, "ShapeAttributeLayer::revokeChildLayer(): Will not remove NULL child" ); if( !haveChild() ) |