desktop/source/lib/init.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 55fb9149d8a102259895186531f761b5771274ca
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue Jul 1 12:37:58 2014 +0200
lok: It is expected that we point directly to the program/ directory.
Change-Id: I54329e8dc914ac2698c441c02dfc9da03b56614f
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5c1c014..231de70 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -533,9 +533,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());
@@ -545,7 +545,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 ?
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
