summaryrefslogtreecommitdiff
path: root/animations
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-04-23 16:04:30 +0200
committerNoel Grandin <noel@peralex.com>2013-04-25 08:56:38 +0200
commit378c038918ca6c7adecf73f49e627c75ebd0e43a (patch)
tree35a5807008bd212488c47874f45eac4585713f84 /animations
parent3086d847d9ac8dbb228c10047fd7ecaa32a45263 (diff)
fdo#46808 Convert animations::ParallelTimeContainer to new style
Change-Id: Iac6337828c807a132e561b5e9017a708be2e9729
Diffstat (limited to 'animations')
-rw-r--r--animations/source/animcore/animcore.cxx18
1 files changed, 13 insertions, 5 deletions
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index a503097f07d5..5b83bc0f43a9 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/animations/XAnimateSet.hpp>
#include <com/sun/star/animations/XAnimateMotion.hpp>
#include <com/sun/star/animations/XAnimateTransform.hpp>
+#include <com/sun/star/animations/XParallelTimeContainer.hpp>
#include <com/sun/star/animations/XTransitionFilter.hpp>
#include <com/sun/star/animations/XTimeContainer.hpp>
#include <com/sun/star/animations/XIterateContainer.hpp>
@@ -108,8 +109,8 @@ class AnimationNodeBase : public XAnimateMotion,
public XTransitionFilter,
public XAnimateSet,
public XAnimateTransform,
+ public XParallelTimeContainer,
public XIterateContainer,
- public XEnumerationAccess,
public XServiceInfo,
public XTypeProvider,
public XAudio,
@@ -547,9 +548,9 @@ Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeEx
aType,
static_cast< XServiceInfo * >( this ),
static_cast< XTypeProvider * >( this ),
- static_cast< XChild * >( static_cast< XTimeContainer * >(this) ),
+ static_cast< XChild * >( static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ) ),
static_cast< XCloneable* >( this ),
- static_cast< XAnimationNode* >( static_cast< XTimeContainer * >(this) ),
+ static_cast< XAnimationNode* >( static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ) ),
static_cast< XInterface* >(static_cast< OWeakObject * >(this)),
static_cast< XWeak* >(static_cast< OWeakObject * >(this)),
static_cast< XChangesNotifier* >( this ),
@@ -560,17 +561,24 @@ Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeEx
switch( mnNodeType )
{
case AnimationNodeType::PAR:
+ aRet = ::cppu::queryInterface(
+ aType,
+ static_cast< XParallelTimeContainer * >( this ),
+ static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ),
+ static_cast< XEnumerationAccess * >( this ),
+ static_cast< XElementAccess * >( this ) );
+ break;
case AnimationNodeType::SEQ:
aRet = ::cppu::queryInterface(
aType,
- static_cast< XTimeContainer * >( this ),
+ static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ),
static_cast< XEnumerationAccess * >( this ),
static_cast< XElementAccess * >( this ) );
break;
case AnimationNodeType::ITERATE:
aRet = ::cppu::queryInterface(
aType,
- static_cast< XTimeContainer * >( this ),
+ static_cast< XTimeContainer * >( static_cast< XIterateContainer * >(this) ),
static_cast< XIterateContainer * >( this ),
static_cast< XEnumerationAccess * >( this ),
static_cast< XElementAccess * >( this ) );