diff options
| author | Noel Grandin <noel@peralex.com> | 2013-04-25 13:30:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-04-25 14:44:07 +0200 |
| commit | a66fd8a99a8c783e4782c487666369c2e567bb95 (patch) | |
| tree | b42df8c6377af896e16993e673aa236fd9ec40ca /sd | |
| parent | fdo#46808, Convert animations::AnimateColor and AnimateSet to new style (diff) | |
| download | core-a66fd8a99a8c783e4782c487666369c2e567bb95.tar.gz core-a66fd8a99a8c783e4782c487666369c2e567bb95.zip | |
fdo#46808, Convert animations::Audio and IterateContainer to new style
The services already existed, they just needed IDL files
Change-Id: I4e3389abb2cb0e41c9bab112cda2a7e896eb271d
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 0bbaf013ea51..5f7a9e18bbb3 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -22,6 +22,8 @@ #include <com/sun/star/animations/AnimateColor.hpp> #include <com/sun/star/animations/AnimateSet.hpp> #include <com/sun/star/animations/AnimationFill.hpp> +#include <com/sun/star/animations/Audio.hpp> +#include <com/sun/star/animations/IterateContainer.hpp> #include <com/sun/star/animations/ParallelTimeContainer.hpp> #include <com/sun/star/animations/SequenceTimeContainer.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -1032,14 +1034,14 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType ) { sal_Int16 nTargetSubItem = mnTargetSubItem; + Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< XTimeContainer > xNewContainer; if(nIterateType) { - Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() ); - xNewContainer.set( xMsf->createInstance( OUString::createFromAscii("com.sun.star.animations.IterateContainer") ), UNO_QUERY_THROW ); + xNewContainer.set( IterateContainer::create( xContext ) ); } else - xNewContainer.set( ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW ); + xNewContainer.set( ParallelTimeContainer::create( xContext ), UNO_QUERY_THROW ); Reference< XTimeContainer > xOldContainer( mxNode, UNO_QUERY_THROW ); Reference< XEnumerationAccess > xEnumerationAccess( mxNode, UNO_QUERY_THROW ); @@ -1553,8 +1555,8 @@ void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSour if( !mxAudio.is() ) try { - Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() ); - Reference< XAudio > xAudio( xMsf->createInstance( "com.sun.star.animations.Audio" ), UNO_QUERY_THROW ); + Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + Reference< XAudio > xAudio( Audio::create( xContext ) ); xAudio->setSource( rSource ); xAudio->setVolume( fVolume ); setAudio( xAudio ); |