diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-19 12:30:27 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-19 13:53:48 +0000 |
| commit | 024d2fde2aae13b07cf5c7b4d85fc3c6abce6913 (patch) | |
| tree | 718a2522eb135a3aac533338d221c0d827e373d6 /include/LibreOfficeKit/LibreOfficeKit.hxx | |
| parent | cac70559013e575009657aa3c5168b88b1f14691 (diff) | |
In lok_init_2, allow vnd.sun.star.pathname user_profile_url
...which takes a raw filesystem pathname that is internally converted to a file
URL (similarly to what is supported for the INIFILENAME and URE_BOOTSTRAP
bootstrap variables in rtl::Bootstrap). That way, the gtktiledviewer executable
doesn't need to try convert a pathname into a URL.
Also adapted various parameter names to make it obvious that URLs get passed,
not pathnames.
Change-Id: I33ab31fe142d94ee47885033ef48278ef5ff55a2
Reviewed-on: https://gerrit.libreoffice.org/24241
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include/LibreOfficeKit/LibreOfficeKit.hxx')
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index 9e18df07dbd2..44e321f25419 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -523,9 +523,9 @@ public: }; /// Factory method to create a lok::Office instance. -inline Office* lok_cpp_init(const char* pInstallPath, const char* pUserProfilePath = NULL) +inline Office* lok_cpp_init(const char* pInstallPath, const char* pUserProfileUrl = NULL) { - LibreOfficeKit* pThis = lok_init_2(pInstallPath, pUserProfilePath); + LibreOfficeKit* pThis = lok_init_2(pInstallPath, pUserProfileUrl); if (pThis == NULL || pThis->pClass->nSize == 0) return NULL; return new ::lok::Office(pThis); |