diff options
author | Noel Grandin <noel@peralex.com> | 2013-01-04 13:38:11 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-01-09 08:08:16 +0200 |
commit | b23fd68eeeddd6973f5ea79da4cf7638094ad8d4 (patch) | |
tree | e977427671a7fe58c5b7fb2e2aef2a03e2f7497a /framework/source/fwe/classes/rootactiontriggercontainer.cxx | |
parent | e88e974e7cd9d92ca338ba6c56baa0aa9a4b0636 (diff) |
fdo#468080, remove unnecessary XMultiServiceFactory from framework
The ActionTrigger classes in framework were not using their
XMultiServiceFactory parameters, so remove them.
And follow that through by cleaning up places that no longer
need to store XMultiServiceFactory references.
Change-Id: I433c4fdb02a56eeef75728893e0c9b749d8313be
Diffstat (limited to 'framework/source/fwe/classes/rootactiontriggercontainer.cxx')
-rw-r--r-- | framework/source/fwe/classes/rootactiontriggercontainer.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 18b99685662a..8fab56fc1a10 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -47,8 +47,8 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() } -RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const Reference< XMultiServiceFactory >& rServiceManager ) : - PropertySetContainer( rServiceManager ) +RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier ) : + PropertySetContainer() , m_bContainerCreated( sal_False ) , m_bContainerChanged( sal_False ) , m_bInContainerCreation( sal_False ) @@ -96,11 +96,11 @@ Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstance( con throw ( Exception, RuntimeException ) { if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER )) - return (OWeakObject *)( new ActionTriggerPropertySet( m_xServiceManager )); + return (OWeakObject *)( new ActionTriggerPropertySet()); else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERCONTAINER )) - return (OWeakObject *)( new ActionTriggerContainer( m_xServiceManager )); + return (OWeakObject *)( new ActionTriggerContainer()); else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR )) - return (OWeakObject *)( new ActionTriggerSeparatorPropertySet( m_xServiceManager )); + return (OWeakObject *)( new ActionTriggerSeparatorPropertySet()); else throw com::sun::star::uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unknown service specifier!" )), (OWeakObject *)this ); } |