diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2009-01-06 08:40:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2009-01-06 08:40:41 +0000 |
| commit | 661a1801197e7d3f3955966f95ad8f377d8b0ddd (patch) | |
| tree | 6e508c8e22e4682f5ead7a9b991b910f997930f3 /xmloff/source/draw | |
| parent | 67cf6df267e9435b5b4f820d3969b9c1661604ad (diff) | |
CWS-TOOLING: integrate CWS impress147
2008-12-16 15:51:15 +0100 wg r265553 : i96805
2008-12-03 12:32:33 +0100 wg r264766 : 96805
2008-12-03 11:40:11 +0100 wg r264761 : 96805
2008-11-20 15:39:56 +0100 cl r264062 : migrated cws from cvs to svn
2008-11-19 14:16:40 +0100 cl r263992 : CWS-TOOLING: rebase CWS impress147 to trunk@263288 (milestone: DEV300:m35)
Diffstat (limited to 'xmloff/source/draw')
| -rw-r--r-- | xmloff/source/draw/animationimport.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 71dc9bfcedef..c6a8ce2eb7cc 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: animationimport.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.62.1 $ * * This file is part of OpenOffice.org. * @@ -804,6 +804,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : // query for optional interfaces that are often used later Reference< XAnimate > xAnimate( mxNode, UNO_QUERY ); + Reference< XCommand > xCommand( mxNode, UNO_QUERY ); Reference< XTransitionFilter > xTransitionFilter( mxNode, UNO_QUERY ); Reference< XIterateContainer > xIter( mxNode, UNO_QUERY ); @@ -950,6 +951,10 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : { xIter->setTarget( aTarget ); } + else if( xCommand.is() ) + { + xCommand->setTarget( aTarget ); + } } } break; @@ -1230,11 +1235,10 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : case ANA_Command: { - if( nNodeType == AnimationNodeType::COMMAND ) + if( xCommand.is() && nNodeType == AnimationNodeType::COMMAND ) { if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_Command) ) ) { - Reference< XCommand > xCommand( mxNode, UNO_QUERY_THROW ); xCommand->setCommand( (sal_Int16)nEnum ); } } |