[Libreoffice-commits] online.git: loolwsd/bundled

Miklos Vajna vmiklos at collabora.co.uk
Mon Oct 26 09:21:34 PDT 2015


 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h     |    6 ++++++
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h |    4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c2a681ff4d8821b59887ea24af3ad4a376b1de4c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Oct 26 17:17:42 2015 +0100

    loolwsd: update the bundled headers

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 83dcc98..d83717b 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -157,6 +157,12 @@ struct _LibreOfficeKitDocumentClass
                                const char* pMimeType,
                                char** pUsedMimeType);
 
+    /// @see lok::Document::paste().
+    bool (*paste) (LibreOfficeKitDocument* pThis,
+                   const char* pMimeType,
+                   const char* pData,
+                   size_t nSize);
+
     /// @see lok::Document::setGraphicSelection
     void (*setGraphicSelection) (LibreOfficeKitDocument* pThis,
                                  int nType,
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index c2f3426..f18e3ca 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -17,7 +17,9 @@ extern "C"
 {
 #endif
 
-#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) || defined(_WIN32) || defined(__APPLE__)
+#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) ||\
+    defined(_WIN32) || defined(__APPLE__) || defined (__NetBSD__) ||\
+    defined (__sun)
 
 #include <stdio.h>
 #include <stdlib.h>


More information about the Libreoffice-commits mailing list