strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress61 (1.4.126); FILE MERGED

Browse source 
2005/06/29 14:27:29 cl 1.4.126.2: #i44633# added correct cloning of animations
2005/06/28 11:55:39 cl 1.4.126.1: #i44633# added correct cloning of animations
This commit is contained in:
Kurt Zenker 2005-07-14 09:44:25 +00:00
parent f5aa733ef2
commit 2a26bfade9
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
sd/source/core/undoanim.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: undoanim.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: kz $ $Date: 2005-03-01 17:30:37 $
* last change: $Author: kz $ $Date: 2005-07-14 10:44:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -65,6 +65,9 @@
#ifndef _COM_SUN_STAR_ANIMATIONS_XANIMATIONNODE_HPP_
#include <com/sun/star/animations/XAnimationNode.hpp>
#endif
#ifndef _SD_CUSTOMANIMATIONCLONER_HXX
#include "CustomAnimationCloner.hxx"
#endif
#include "undoanim.hxx"
#include "glob.hrc"
@ -88,21 +91,19 @@ struct UndoAnimationImpl
SdPage* mpPage;
Reference< XAnimationNode > mxOldNode;
Reference< XAnimationNode > mxNewNode;
bool mbNewNodeSet;
};
UndoAnimation::UndoAnimation( SdDrawDocument* pDoc, SdPage* pThePage )
: SdrUndoAction( *pDoc ), mpImpl( new UndoAnimationImpl )
{
mpImpl->mpPage = pThePage;
mpImpl->mbNewNodeSet = false;
try
{
if( pThePage->getAnimationNode().is() )
{
Reference< XCloneable > xCloneAble( pThePage->getAnimationNode(), UNO_QUERY_THROW );
Reference< XAnimationNode > xClone( xCloneAble->createClone(), UNO_QUERY_THROW );
mpImpl->mxOldNode = xClone;
}
if( pThePage->mxAnimationNode.is() )
mpImpl->mxOldNode = sd::Clone( pThePage->getAnimationNode() );
}
catch( Exception& e )
{
@ -120,18 +121,18 @@ void UndoAnimation::Undo()
{
try
{
if( !mpImpl->mxNewNode.is() )
if( !mpImpl->mbNewNodeSet )
{
Reference< XCloneable > xCloneAble( mpImpl->mpPage->mxAnimationNode, UNO_QUERY_THROW );
mpImpl->mxNewNode.set( xCloneAble->createClone(), UNO_QUERY_THROW );
if( mpImpl->mpPage->mxAnimationNode.is() )
mpImpl->mxNewNode.set( sd::Clone( mpImpl->mpPage->mxAnimationNode ) );
mpImpl->mbNewNodeSet = true;
}
Reference< XCloneable > xCloneAble( mpImpl->mxOldNode, UNO_QUERY_THROW );
Reference< XAnimationNode > xClone( xCloneAble->createClone(), UNO_QUERY_THROW );
Reference< XAnimationNode > xOldNode;
if( mpImpl->mxOldNode.is() )
xOldNode = sd::Clone( mpImpl->mxOldNode );
mpImpl->mpPage->mxAnimationNode = xClone;
if( mpImpl->mpPage->mpMainSequence.get() )
mpImpl->mpPage->mpMainSequence->reset( xClone );
mpImpl->mpPage->setAnimationNode( xOldNode );
}
catch( Exception& e )
{
@ -144,10 +145,10 @@ void UndoAnimation::Redo()
{
try
{
Reference< XCloneable > xCloneAble( mpImpl->mxNewNode, UNO_QUERY_THROW );
mpImpl->mpPage->mxAnimationNode.set( xCloneAble->createClone(), UNO_QUERY_THROW );
if( mpImpl->mpPage->mpMainSequence.get() )
mpImpl->mpPage->mpMainSequence->reset( mpImpl->mpPage->mxAnimationNode );
Reference< XAnimationNode > xNewNode;
if( mpImpl->mxNewNode.is() )
xNewNode = sd::Clone( mpImpl->mxNewNode );
mpImpl->mpPage->setAnimationNode( xNewNode );
}
catch( Exception& e )
{