diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:28:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:28:27 +0000 |
| commit | f27b6bf382df7d786220e7f90f33e2e4889dde0f (patch) | |
| tree | 62c23b658c9be9a83a709aff4122c45b4aa643aa | |
| parent | 6cc4ddcff0643e8f1ee5706a1caba866c17780cc (diff) | |
INTEGRATION: CWS presfixes09 (1.8.16); FILE MERGED
2006/10/18 19:54:13 thb 1.8.16.6: RESYNC: (1.9-1.11); FILE MERGED
2006/09/18 15:26:49 thb 1.8.16.5: #i10000# Fixed post-MERGE breakages
2006/09/15 22:13:13 thb 1.8.16.4: RESYNC: (1.8-1.9); FILE MERGED
2006/04/24 13:25:28 thb 1.8.16.3: #i53194# Unified include statements (local headers always have double quotes; external headers angle brackets); reverted EventMultiplexer pause events to shared_ptr; removed EventMultiplexer::removeViewHandler(), since the handler is held weakly, anyway.
2006/04/12 20:40:06 thb 1.8.16.2: #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:15 thb 1.8.16.1: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
| -rw-r--r-- | slideshow/source/engine/animationnodes/animationbasenode.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index 01dc84f0af1b..41351604344d 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: animationbasenode.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2006-11-21 17:27:43 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:28:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -54,10 +54,9 @@ #include <vector> #include <algorithm> -namespace css = com::sun::star; -using namespace css; +using namespace com::sun::star; -namespace presentation { +namespace slideshow { namespace internal { AnimationBaseNode::AnimationBaseNode( @@ -95,7 +94,7 @@ AnimationBaseNode::AnimationBaseNode( // // - ParagraphTarget target at the XAnimationNode // (generate an independent shape subset) - if( rContext.mpMasterShapeSubset.get() ) + if( rContext.mpMasterShapeSubset ) { if( rContext.mpMasterShapeSubset->isFullSet() ) { @@ -121,7 +120,7 @@ AnimationBaseNode::AnimationBaseNode( else { // no shape provided. Maybe a ParagraphTarget? - css::presentation::ParagraphTarget aTarget; + presentation::ParagraphTarget aTarget; if( !(mxAnimateNode->getTarget() >>= aTarget) ) ENSURE_AND_THROW( @@ -139,9 +138,9 @@ AnimationBaseNode::AnimationBaseNode( // is set to ONLY_TEXT. OSL_ENSURE( mxAnimateNode->getSubItem() == - css::presentation::ShapeAnimationSubType::ONLY_TEXT || + presentation::ShapeAnimationSubType::ONLY_TEXT || mxAnimateNode->getSubItem() == - css::presentation::ShapeAnimationSubType::AS_WHOLE, + presentation::ShapeAnimationSubType::AS_WHOLE, "ParagraphTarget given, but subitem not AS_TEXT or AS_WHOLE? " "Make up your mind, I'll ignore the subitem." ); @@ -485,5 +484,5 @@ AttributableShapeSharedPtr AnimationBaseNode::getShape() const } } // namespace internal -} // namespace presentation +} // namespace slideshow |