desktop/source/lib/init.cxx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
New commits: commit 7e04d519ce1579d75303169d6791e1eacbf6fe22 Author: Andrzej Hunt <[email protected]> Date: Fri Jun 20 09:51:15 2014 +0100 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 Reviewed-on: https://gerrit.libreoffice.org/10005 Reviewed-by: Jan Holesovsky <[email protected]> Tested-by: Jan Holesovsky <[email protected]> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 710b474..61880f04 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -370,16 +370,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 + "/" + LIBO_ETC_FOLDER + "/" + SAL_CONFIGFILE("soffice")); xContext = cppu::defaultBootstrap_InitialComponentContext(); fprintf(stderr, "Uno initialized %d\n", xContext.is()); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
