diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-19 12:30:27 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:32 -0400 |
| commit | 10d4941c28ed9afabadfbb6cc4751d26556873fe (patch) | |
| tree | 635599cf406700c203e87eb461e778a327bdaccd /libreofficekit | |
| parent | 6f92ded4d65a94a3dc61fda08933f5ceb05908fe (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.
Reviewed-on: https://gerrit.libreoffice.org/24241
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 024d2fde2aae13b07cf5c7b4d85fc3c6abce6913)
Change-Id: I33ab31fe142d94ee47885033ef48278ef5ff55a2
Diffstat (limited to 'libreofficekit')
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 016a9731fd91..0ba201ad33c9 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -505,7 +505,8 @@ static void createModelAndView(const char* pLOPath, const char* pDocPath, const { const std::string& rArgument = rArguments[i]; if (rArgument == "--user-profile" && i + 1 < rArguments.size()) - aUserProfile = std::string("file://") + rArguments[i + 1].c_str(); + aUserProfile = std::string("vnd.sun.star.pathname:") + + rArguments[i + 1].c_str(); } const gchar* pUserProfile = aUserProfile.empty() ? nullptr : aUserProfile.c_str(); GtkWidget* pDocView = lok_doc_view_new_from_user_profile(pLOPath, pUserProfile, nullptr, nullptr); |