mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lokdocview: Set a 'default' path for LOK init

Browse Source 
When passed NULL to lok_doc_view_new, use the default path :
$libdir/libreoffice/program as LOK install path

Change-Id: I1e033c407184b29b1509cfb8c416b514591d67ce
Reviewed-on: https://gerrit.libreoffice.org/20476
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Pranav Kant
2015-12-08 23:14:25 +05:30
committed by David Tardon
parent 7060525a64
commit 424c09b10d
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/LibreOfficeKit/LibreOfficeKitGtk.h
View File

@@ -42,7 +42,8 @@ GType lok_doc_view_get_type (void) G_GNUC
/** /**
* lok_doc_view_new: * lok_doc_view_new:
* @pPath: LibreOffice install path. * @pPath: (nullable): LibreOffice install path. Pass null to set it to default
* path which in most cases would be $libdir/libreoffice/program
* @cancellable: The cancellable object that you can use to cancel this * @cancellable: The cancellable object that you can use to cancel this
* operation. * operation.
* @error: The error that will be set if the object fails to initialize. * @error: The error that will be set if the object fails to initialize.

4
libreofficekit/Library_libreofficekitgtk.mk
View File

@@ -28,6 +28,10 @@ $(eval $(call gb_Library_add_libs,libreofficekitgtk,\
$(GTK3_LIBS) \ $(GTK3_LIBS) \
)) ))
$(eval $(call gb_Library_add_defs,libreofficekitgtk,\
-DLOK_PATH="\"$(LIBDIR)/libreoffice/$(LIBO_LIB_FOLDER)\"" \
))
ifeq ($(OS),$(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS),$(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,libreofficekitgtk,\ $(eval $(call gb_Library_add_libs,libreofficekitgtk,\
$(DLOPEN_LIBS) -lm \ $(DLOPEN_LIBS) -lm \

2
libreofficekit/source/gtk/lokdocview.cxx
View File

@@ -2280,7 +2280,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
SAL_DLLPUBLIC_EXPORT GtkWidget* SAL_DLLPUBLIC_EXPORT GtkWidget*
lok_doc_view_new (const gchar* pPath, GCancellable *cancellable, GError **error) lok_doc_view_new (const gchar* pPath, GCancellable *cancellable, GError **error)
{ {
return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error, "lopath", pPath, NULL)); return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error, "lopath", pPath == NULL ? LOK_PATH : pPath, NULL));
} }
SAL_DLLPUBLIC_EXPORT GtkWidget* lok_doc_view_new_from_widget(LOKDocView* pOldLOKDocView) SAL_DLLPUBLIC_EXPORT GtkWidget* lok_doc_view_new_from_widget(LOKDocView* pOldLOKDocView)