diff options
author | sb <sb@openoffice.org> | 2010-09-14 09:15:02 +0200 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-09-14 09:15:02 +0200 |
commit | e21f2f0f0187ebaa4a5b7c64a6e5c08d5efc6116 (patch) | |
tree | 6edaeb56e8dac0a37dcadf5e4317a71910dc069e /cppuhelper/source/bootstrap.cxx | |
parent | 1ea60d118390ba276c5ecc80af7876c4f227076d (diff) |
sb129: #i113189# adapted tests; improved subsequenttests
Diffstat (limited to 'cppuhelper/source/bootstrap.cxx')
-rw-r--r-- | cppuhelper/source/bootstrap.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 5575c118420e..f892cdcab0f3 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -380,9 +380,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( |