diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-09-29 10:24:13 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-09-29 10:24:13 +0200 |
| commit | 3db3d0728c6ba9f3277b32d3fefa900ecbcaf5f5 (patch) | |
| tree | 1bac27ee52551a6f35856fcc282460dbf47f5312 /cppuhelper/source/bootstrap.cxx | |
| parent | 018583c60b95ab6c5aace51960764de4d64dd95e (diff) | |
| parent | dc8450a8a8867c2e0662b38ef7a4edefe80bfd87 (diff) | |
CWS-TOOLING: integrate CWS sb129
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( |