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

INTEGRATION: CWS sb76 (1.28.52); FILE MERGED

Browse Source 
2007/08/31 11:00:10 sb 1.28.52.1: #i77885# Consolidate stoc libraries; patch by jnavrati.
This commit is contained in:
Jens-Heiner Rechtien
2007-09-27 11:50:59 +00:00
parent eca4cb73f7
commit 186fcecdbb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cppuhelper/source/bootstrap.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: bootstrap.cxx,v $ * $RCSfile: bootstrap.cxx,v $
* *
* $Revision: 1.28 $ * $Revision: 1.29 $
* *
* last change: $Author: rt $ $Date: 2006-12-01 17:18:20 $ * last change: $Author: hr $ $Date: 2007-09-27 12:50:59 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -398,7 +398,7 @@ SAL_CALL defaultBootstrap_InitialComponentContext(
Reference<registry::XRegistryKey> xEmptyKey; Reference<registry::XRegistryKey> xEmptyKey;
Reference<lang::XSingleServiceFactory> xSimRegFac( Reference<lang::XSingleServiceFactory> xSimRegFac(
loadSharedLibComponentFactory( loadSharedLibComponentFactory(
OUSTR("simplereg.uno" SAL_DLLEXTENSION), bootstrapPath, OUSTR("bootstrap.uno" SAL_DLLEXTENSION), bootstrapPath,
OUSTR("com.sun.star.comp.stoc.SimpleRegistry"), OUSTR("com.sun.star.comp.stoc.SimpleRegistry"),
smgr_XMultiServiceFactory, smgr_XMultiServiceFactory,
xEmptyKey), xEmptyKey),
@@ -406,7 +406,7 @@ SAL_CALL defaultBootstrap_InitialComponentContext(
Reference<lang::XSingleServiceFactory> xNesRegFac( Reference<lang::XSingleServiceFactory> xNesRegFac(
loadSharedLibComponentFactory( loadSharedLibComponentFactory(
OUSTR("nestedreg.uno" SAL_DLLEXTENSION), bootstrapPath, OUSTR("bootstrap.uno" SAL_DLLEXTENSION), bootstrapPath,
OUSTR("com.sun.star.comp.stoc.NestedRegistry"), OUSTR("com.sun.star.comp.stoc.NestedRegistry"),
smgr_XMultiServiceFactory, smgr_XMultiServiceFactory,
xEmptyKey), xEmptyKey),