Kaydet (Commit) 7a228e8d authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Jan Holesovsky

The 2nd parameter to lo_initialize() is a URL so use such naming consistently

Change-Id: Id4e7f8556d6910ab43b0f7b8ba09e7be8b1ec1d1
üst aa448403
...@@ -5162,14 +5162,14 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char ...@@ -5162,14 +5162,14 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
} }
SAL_DLLPUBLIC_EXPORT SAL_DLLPUBLIC_EXPORT
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) if (!gImpl)
{ {
SAL_INFO("lok", "Create libreoffice object"); SAL_INFO("lok", "Create libreoffice object");
gImpl = new LibLibreOffice_Impl(); 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); lo_destroy(gImpl);
} }
...@@ -5184,9 +5184,9 @@ LibreOfficeKit *libreofficekit_hook(const char* install_path) ...@@ -5184,9 +5184,9 @@ LibreOfficeKit *libreofficekit_hook(const char* install_path)
} }
SAL_JNI_EXPORT 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) static void lo_destroy(LibreOfficeKit* pThis)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment