Some clean-up
Change-Id: Ic65d1d5dcf2a0a7dbc0b382002b15e47f7998344
This commit is contained in:
parent
3c47b0befd
commit
5d3cec6aaf
1 changed files with 9 additions and 2 deletions
|
@ -146,9 +146,16 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory (
|
|||
}
|
||||
else
|
||||
{
|
||||
pResult = component_getFactoryHelper( pImplementationName, reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ), reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ), serviceDecl );
|
||||
pResult = comphelper::service_decl::component_getFactoryHelper(
|
||||
pImplementationName,
|
||||
static_cast<css::lang::XMultiServiceFactory *>(
|
||||
_pServiceManager),
|
||||
static_cast<css::registry::XRegistryKey *>(pRegistryKey),
|
||||
serviceDecl );
|
||||
if ( !pResult )
|
||||
pResult = ::cppu::component_getFactoryHelper( pImplementationName, _pServiceManager, pRegistryKey, s_aServiceEntries );
|
||||
pResult = cppu::component_getFactoryHelper(
|
||||
pImplementationName, _pServiceManager, pRegistryKey,
|
||||
s_aServiceEntries );
|
||||
}
|
||||
|
||||
if ( xFactory.is() )
|
||||
|
|
Loading…
Reference in a new issue