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

Merge remote-tracking branch 'origin/integration/dev300_m101'

Browse Source 
Conflicts:
	bridges/source/remote/urp/urp_environment.cxx
	bridges/source/remote/urp/urp_propertyobject.cxx
	bridges/source/remote/urp/urp_reader.cxx
	remotebridges/source/factory/bridgefactory.cxx
	stoc/source/corereflection/crefl.cxx
	stoc/source/javavm/javavm.cxx
	stoc/source/simpleregistry/simpleregistry.cxx
This commit is contained in:
Jan Holesovsky
2011-03-18 15:58:02 +01:00
parent 999dce7d69 793a9a7993
commit a3a19632f4
441 changed files with 16961 additions and 18365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cppuhelper/source/bootstrap.cxx
View File

@@ -381,9 +381,15 @@ SAL_CALL defaultBootstrap_InitialComponentContext(
Bootstrap const & bootstrap )
SAL_THROW( (Exception) )
{
OUString bootstrapPath( get_this_libpath() );
OUString iniDir;
OUString bootstrapPath;
if (!bootstrap.getFrom(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URE_INTERNAL_LIB_DIR")),
bootstrapPath))
{
bootstrapPath = get_this_libpath();
}
OUString iniDir;
osl_getProcessWorkingDir(&iniDir.pData);
Reference<lang::XMultiComponentFactory> smgr_XMultiComponentFactory(