diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-19 09:09:19 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-03 09:30:59 +0000 |
| commit | 549f67a85774838abdefdb7916beb0f26e2f9d2c (patch) | |
| tree | a92140cf5ddad0ea7cd4ee81da5c34c1ec64220a /include | |
| parent | 947cd18108ca03abe79895fa38520338da159aa6 (diff) | |
tdf#99314 lokdocview: add new userprofileurl property
So that users of the widget can use a custom user profile, allowing
running widgets users and LibreOffice in parallel.
(cherry picked from commit df784ec1bf3d1745a291056df28bec799d4fdee3)
Conflicts:
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
Change-Id: I1bd0a8e53aa3216adc721052cf30f0dd174327bd
Reviewed-on: https://gerrit.libreoffice.org/24591
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKitGtk.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h index 1df27c106214..91e29c83db57 100644 --- a/include/LibreOfficeKit/LibreOfficeKitGtk.h +++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h @@ -55,6 +55,23 @@ GtkWidget* lok_doc_view_new (const gchar* GError **error); /** + * lok_doc_view_new_from_user_profile: + * @pPath: (nullable): LibreOffice install path. Pass null to set it to default + * path which in most cases would be $libdir/libreoffice/program + * @pUserProfile: (nullable): User profile URL. Pass non-null to be able to + * use this widget and LibreOffice itself in parallel. + * @cancellable: The cancellable object that you can use to cancel this + * operation. + * @error: The error that will be set if the object fails to initialize. + * + * Returns: (transfer none): The #LOKDocView widget instance. + */ +GtkWidget* lok_doc_view_new_from_user_profile (const gchar* pPath, + const gchar* pUserProfile, + GCancellable *cancellable, + GError **error); + +/** * lok_doc_view_new_from_widget: * @pDocView: The #LOKDocView instance * |