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

Factor out "bootstrap.uno" repeated for all bootstrap services

Browse Source
This commit is contained in:
Tor Lillqvist
2011-08-08 14:09:57 +03:00
parent 2ccabe21ad
commit c89d682d94
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cppuhelper/source/servicefactory.cxx
View File

@@ -316,7 +316,7 @@ static void add_access_control_entries(
namespace { namespace {
void addFactories( void addFactories(
char const * const * ppNames /* lib, implname, ..., 0 */, char const * const * ppNames /* implname, ..., 0 */,
OUString const & bootstrapPath, OUString const & bootstrapPath,
Reference< lang::XMultiComponentFactory > const & xMgr, Reference< lang::XMultiComponentFactory > const & xMgr,
Reference< registry::XRegistryKey > const & xKey ) Reference< registry::XRegistryKey > const & xKey )
@@ -328,11 +328,11 @@ void addFactories(
while (*ppNames) while (*ppNames)
{ {
OUString lib( OUString::createFromAscii( *ppNames++ ) );
OUString implName( OUString::createFromAscii( *ppNames++ ) ); OUString implName( OUString::createFromAscii( *ppNames++ ) );
Any aFac( makeAny( loadSharedLibComponentFactory( Any aFac( makeAny( loadSharedLibComponentFactory(
lib, bootstrapPath, implName, xSF, xKey ) ) ); OUSTR("bootstrap.uno" SAL_DLLEXTENSION),
bootstrapPath, implName, xSF, xKey ) ) );
xSet->insert( aFac ); xSet->insert( aFac );
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
if (xSet->has( aFac )) if (xSet->has( aFac ))
@@ -365,7 +365,7 @@ void addFactories(
{ {
OStringBuffer buf( 64 ); OStringBuffer buf( 64 );
buf.append( "### failed inserting shared lib \"" ); buf.append( "### failed inserting shared lib \"" );
buf.append( ppNames[ -2 ] ); buf.append( "bootstrap.uno" SAL_DLLEXTENSION );
buf.append( "\"!!!" ); buf.append( "\"!!!" );
OString str( buf.makeStringAndClear() ); OString str( buf.makeStringAndClear() );
OSL_FAIL( str.getStr() ); OSL_FAIL( str.getStr() );
@@ -394,21 +394,13 @@ Reference< lang::XMultiComponentFactory > bootstrapInitialSF(
// add initial bootstrap services // add initial bootstrap services
static char const * ar[] = { static char const * ar[] = {
"bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.OServiceManagerWrapper", "com.sun.star.comp.stoc.OServiceManagerWrapper",
"bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.DLLComponentLoader", "com.sun.star.comp.stoc.DLLComponentLoader",
"bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.SimpleRegistry", "com.sun.star.comp.stoc.SimpleRegistry",
"bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.NestedRegistry", "com.sun.star.comp.stoc.NestedRegistry",
"bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.TypeDescriptionManager", "com.sun.star.comp.stoc.TypeDescriptionManager",
"bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.ImplementationRegistration", "com.sun.star.comp.stoc.ImplementationRegistration",
"bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.security.comp.stoc.AccessController", "com.sun.star.security.comp.stoc.AccessController",
"bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.security.comp.stoc.FilePolicy", "com.sun.star.security.comp.stoc.FilePolicy",
0 0
}; };