diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-06-20 09:51:15 +0100 |
|---|---|---|
| committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-06-25 13:04:33 +0100 |
| commit | 3545b78755672321e3017fd25dec756827459fb6 (patch) | |
| tree | b2a0aa30204062f48c7765d976d54d3654576d88 /desktop | |
| parent | 5da5882df48b4ef9cb9807798102453249cd1aef (diff) | |
Use full sofficerc for LOK.
Otherwise we get segfaults in cppu::idefaultConstructElements when exiting,
in addition to complaints of:
ignoring GError "Operation not supported" for <***RECURSION DETECTED***/log.txt>
Change-Id: If2f56873f50ba957288d1e5591db967d248ee7a4
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index c3792ad06cea..7e112f4ea061 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -520,16 +520,7 @@ static void aBasicErrorFunc(const OUString& rError, const OUString& rAction) static void initialize_uno(const OUString &aAppURL) { - rtl::Bootstrap::setIniFilename( aAppURL + "/fundamentalrc" ); - - rtl::Bootstrap::set( "CONFIGURATION_LAYERS", - "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry " - "res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry " -// "bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini " ); -// "sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini " -// "userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini " -// "user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstraprc:UserInstallation}/user/registrymodifications.xcu" - ); + rtl::Bootstrap::setIniFilename( aAppURL + "/sofficerc" ); xContext = cppu::defaultBootstrap_InitialComponentContext(); fprintf(stderr, "Uno initialized %d\n", xContext.is()); |