[Libreoffice-commits] core.git: desktop/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 25 12:33:49 UTC 2018
desktop/source/lib/init.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 616554c36eec41f80424dd2a3c1e99d227b9eee6
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Oct 25 15:29:26 2018 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Oct 25 15:32:38 2018 +0300
The 2nd parameter to lo_initialize() is a URL so use such naming consistently
Change-Id: Id4e7f8556d6910ab43b0f7b8ba09e7be8b1ec1d1
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 85b188b15e84..a2182e9ea2a8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4125,14 +4125,14 @@ __attribute__ ((visibility("default")))
#else
SAL_DLLPUBLIC_EXPORT
#endif
-LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user_profile_path)
+LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user_profile_url)
{
if (!gImpl)
{
SAL_INFO("lok", "Create libreoffice object");
gImpl = new LibLibreOffice_Impl();
- if (!lo_initialize(gImpl, install_path, user_profile_path))
+ if (!lo_initialize(gImpl, install_path, user_profile_url))
{
lo_destroy(gImpl);
}
@@ -4151,9 +4151,9 @@ LibreOfficeKit *libreofficekit_hook(const char* install_path)
}
SAL_JNI_EXPORT
-int lok_preinit(const char* install_path, const char* user_profile_path)
+int lok_preinit(const char* install_path, const char* user_profile_url)
{
- return lo_initialize(nullptr, install_path, user_profile_path);
+ return lo_initialize(nullptr, install_path, user_profile_url);
}
static void lo_destroy(LibreOfficeKit* pThis)
More information about the Libreoffice-commits
mailing list