|
 |
f325b2 |
From 3943bc9014e426740ca5f756eae4cf4dd124bc23 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Pranav Kant <pranavk@libreoffice.org>
|
|
|
f325b2 |
Date: Tue, 8 Dec 2015 23:14:25 +0530
|
|
|
f325b2 |
Subject: [PATCH 369/398] lokdocview: Set a 'default' path for LOK init
|
|
|
f325b2 |
|
|
|
f325b2 |
When passed NULL to lok_doc_view_new, use the default path :
|
|
|
f325b2 |
$libdir/libreoffice/program as LOK install path
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I1e033c407184b29b1509cfb8c416b514591d67ce
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/20476
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
(cherry picked from commit 424c09b10d3d6ba6edfed2dcf560d5ce2c950b9d)
|
|
|
f325b2 |
(cherry picked from commit dabfa0ce06f605fd0e8de32774b6385fd6ffbd56)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
include/LibreOfficeKit/LibreOfficeKitGtk.h | 3 ++-
|
|
|
f325b2 |
libreofficekit/Library_libreofficekitgtk.mk | 4 ++++
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 2 +-
|
|
|
f325b2 |
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
|
|
|
f325b2 |
index b2f17f14b6cb..1b03e4633547 100644
|
|
|
f325b2 |
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
|
|
|
f325b2 |
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
|
|
|
f325b2 |
@@ -42,7 +42,8 @@ GType lok_doc_view_get_type (void) G_GNUC
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* lok_doc_view_new:
|
|
|
f325b2 |
- * @pPath: LibreOffice install path.
|
|
|
f325b2 |
+ * @pPath: (nullable): LibreOffice install path. Pass null to set it to default
|
|
|
f325b2 |
+ * path which in most cases would be $libdir/libreoffice/program
|
|
|
f325b2 |
* @cancellable: The cancellable object that you can use to cancel this
|
|
|
f325b2 |
* operation.
|
|
|
f325b2 |
* @error: The error that will be set if the object fails to initialize.
|
|
|
f325b2 |
diff --git a/libreofficekit/Library_libreofficekitgtk.mk b/libreofficekit/Library_libreofficekitgtk.mk
|
|
|
f325b2 |
index 3eba939ad56c..fc62e72ca723 100644
|
|
|
f325b2 |
--- a/libreofficekit/Library_libreofficekitgtk.mk
|
|
|
f325b2 |
+++ b/libreofficekit/Library_libreofficekitgtk.mk
|
|
|
f325b2 |
@@ -28,6 +28,10 @@ $(eval $(call gb_Library_add_libs,libreofficekitgtk,\
|
|
|
f325b2 |
$(GTK3_LIBS) \
|
|
|
f325b2 |
))
|
|
|
f325b2 |
|
|
|
f325b2 |
+$(eval $(call gb_Library_add_defs,libreofficekitgtk,\
|
|
|
f325b2 |
+ -DLOK_PATH="\"$(LIBDIR)/libreoffice/$(LIBO_LIB_FOLDER)\"" \
|
|
|
f325b2 |
+))
|
|
|
f325b2 |
+
|
|
|
f325b2 |
ifeq ($(OS),$(filter LINUX %BSD SOLARIS, $(OS)))
|
|
|
f325b2 |
$(eval $(call gb_Library_add_libs,libreofficekitgtk,\
|
|
|
f325b2 |
$(DLOPEN_LIBS) -lm \
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 424d80eabcf9..34823437e6ad 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -2385,7 +2385,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
|
|
|
f325b2 |
SAL_DLLPUBLIC_EXPORT GtkWidget*
|
|
|
f325b2 |
lok_doc_view_new (const gchar* pPath, GCancellable *cancellable, GError **error)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error, "lopath", pPath, NULL));
|
|
|
f325b2 |
+ return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error, "lopath", pPath == NULL ? LOK_PATH : pPath, NULL));
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
SAL_DLLPUBLIC_EXPORT GtkWidget* lok_doc_view_new_from_widget(LOKDocView* pOldLOKDocView)
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|