mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, Convert some XMultiServiceFactory to XComponentContext

Browse Source 
Change-Id: I1dcfee9fa0fdc4457754396ffb52cc8462f3906a
This commit is contained in:
Noel Grandin
2013-04-25 14:43:24 +02:00
parent 7709511aed
commit 3286827b38
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sd/inc/CustomAnimationEffect.hxx
View File

@@ -350,8 +350,6 @@ protected:
void notify_listeners(); void notify_listeners();
::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer > createParallelTimeContainer() const;
void updateTextGroups(); void updateTextGroups();
protected: protected:

33
sd/source/core/CustomAnimationEffect.cxx
View File

@@ -1886,7 +1886,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb
try try
{ {
Reference< XTimeContainer > xEffectContainer( createParallelTimeContainer() ); Reference< XTimeContainer > xEffectContainer( ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW );
Reference< XAnimationNode > xAnimateMotion( AnimateMotion::create( ::comphelper::getProcessComponentContext() ) ); Reference< XAnimationNode > xAnimateMotion( AnimateMotion::create( ::comphelper::getProcessComponentContext() ) );
xAnimateMotion->setDuration( Any( fDuration ) ); xAnimateMotion->setDuration( Any( fDuration ) );
@@ -2013,7 +2013,7 @@ void EffectSequenceHelper::implRebuild()
do do
{ {
// create a par container for the next click node and all following with and after effects // create a par container for the next click node and all following with and after effects
Reference< XTimeContainer > xOnClickContainer( createParallelTimeContainer() ); Reference< XTimeContainer > xOnClickContainer( ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW );
Event aEvent; Event aEvent;
if( mxEventSource.is() ) if( mxEventSource.is() )
@@ -2047,7 +2047,7 @@ void EffectSequenceHelper::implRebuild()
do do
{ {
// create a par container for the current click or after effect node and all following with effects // create a par container for the current click or after effect node and all following with effects
Reference< XTimeContainer > xWithContainer( createParallelTimeContainer() ); Reference< XTimeContainer > xWithContainer( ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW );
Reference< XAnimationNode > xWithContainerNode( xWithContainer, UNO_QUERY_THROW ); Reference< XAnimationNode > xWithContainerNode( xWithContainer, UNO_QUERY_THROW );
xWithContainer->setBegin( makeAny( fBegin ) ); xWithContainer->setBegin( makeAny( fBegin ) );
xOnClickContainer->appendChild( xWithContainerNode ); xOnClickContainer->appendChild( xWithContainerNode );
@@ -2105,14 +2105,6 @@ void EffectSequenceHelper::implRebuild()
// -------------------------------------------------------------------- // --------------------------------------------------------------------
Reference< XTimeContainer > EffectSequenceHelper::createParallelTimeContainer() const
{
const OUString aServiceName( "com.sun.star.animations.ParallelTimeContainer" );
return Reference< XTimeContainer >( ::comphelper::getProcessServiceFactory()->createInstance(aServiceName), UNO_QUERY );
}
// --------------------------------------------------------------------
stl_CustomAnimationEffect_search_node_predict::stl_CustomAnimationEffect_search_node_predict( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSearchNode ) stl_CustomAnimationEffect_search_node_predict::stl_CustomAnimationEffect_search_node_predict( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSearchNode )
: mxSearchNode( xSearchNode ) : mxSearchNode( xSearchNode )
{ {
@@ -2174,7 +2166,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
} }
else // nextClick else // nextClick
{ {
Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() ); Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
// insert the aftereffect in the next group // insert the aftereffect in the next group
Reference< XTimeContainer > xClickContainer( xContainer->getParent(), UNO_QUERY_THROW ); Reference< XTimeContainer > xClickContainer( xContainer->getParent(), UNO_QUERY_THROW );
@@ -2199,15 +2191,11 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
else else
{ {
// this does not yet have a child container, create one // this does not yet have a child container, create one
const OUString aServiceName( "com.sun.star.animations.ParallelTimeContainer" ); xNextContainer.set( ParallelTimeContainer::create(xContext), UNO_QUERY_THROW );
xNextContainer = Reference< XTimeContainer >::query( xMsf->createInstance(aServiceName) );
if( xNextContainer.is() ) Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW );
{ xNode->setBegin( makeAny( (double)0.0 ) );
Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW ); xNextClickContainer->appendChild( xNode );
xNode->setBegin( makeAny( (double)0.0 ) );
xNextClickContainer->appendChild( xNode );
}
} }
DBG_ASSERT( xNextContainer.is(), "ppt::stl_process_after_effect_node_func::operator(), could not find/create container!" ); DBG_ASSERT( xNextContainer.is(), "ppt::stl_process_after_effect_node_func::operator(), could not find/create container!" );
} }
@@ -2216,8 +2204,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
// if we don't have a next container, we add one to the sequence container // if we don't have a next container, we add one to the sequence container
if( !xNextContainer.is() ) if( !xNextContainer.is() )
{ {
const OUString aServiceName( "com.sun.star.animations.ParallelTimeContainer" ); Reference< XTimeContainer > xNewClickContainer( ParallelTimeContainer::create( xContext ), UNO_QUERY_THROW );
Reference< XTimeContainer > xNewClickContainer( xMsf->createInstance(aServiceName), UNO_QUERY_THROW );
Reference< XAnimationNode > xNewClickNode( xNewClickContainer, UNO_QUERY_THROW ); Reference< XAnimationNode > xNewClickNode( xNewClickContainer, UNO_QUERY_THROW );
@@ -2229,7 +2216,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
Reference< XAnimationNode > xRefNode( xClickContainer, UNO_QUERY_THROW ); Reference< XAnimationNode > xRefNode( xClickContainer, UNO_QUERY_THROW );
xSequenceContainer->insertAfter( xNewClickNode, xRefNode ); xSequenceContainer->insertAfter( xNewClickNode, xRefNode );
xNextContainer = Reference< XTimeContainer >::query( xMsf->createInstance(aServiceName) ); xNextContainer.set( ParallelTimeContainer::create( xContext ), UNO_QUERY_THROW );
DBG_ASSERT( xNextContainer.is(), "ppt::stl_process_after_effect_node_func::operator(), could not create container!" ); DBG_ASSERT( xNextContainer.is(), "ppt::stl_process_after_effect_node_func::operator(), could not create container!" );
if( xNextContainer.is() ) if( xNextContainer.is() )