From 971cecc1953dd152da8d759b71a9189e00c56f32 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 1 Jul 2014 12:37:58 +0200 Subject: lok: It is expected that we point directly to the program/ directory. Change-Id: I54329e8dc914ac2698c441c02dfc9da03b56614f Reviewed-on: https://gerrit.libreoffice.org/10010 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- desktop/source/lib/init.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 61880f048c87..964aa3b893cc 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -368,9 +368,9 @@ static void aBasicErrorFunc(const OUString& rError, const OUString& rAction) fprintf(stderr, "Unexpected basic error dialog '%s'\n", aBuffer.getStr()); } -static void initialize_uno(const OUString &aAppURL) +static void initialize_uno(const OUString &aAppProgramURL) { - rtl::Bootstrap::setIniFilename(aAppURL + "/" + LIBO_ETC_FOLDER + "/" + SAL_CONFIGFILE("soffice")); + rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" + SAL_CONFIGFILE("soffice")); xContext = cppu::defaultBootstrap_InitialComponentContext(); fprintf(stderr, "Uno initialized %d\n", xContext.is()); @@ -380,7 +380,7 @@ static void initialize_uno(const OUString &aAppURL) // set UserInstallation to user profile dir in test/user-template // rtl::Bootstrap aDefaultVars; -// aDefaultVars.set(OUString("UserInstallation"), aAppURL + "../registry" ); +// aDefaultVars.set(OUString("UserInstallation"), aAppProgramURL + "../registry" ); // configmgr setup ? } -- cgit v1.2.3