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

[Tor Lillqvist]

 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |   23 +++++++++++
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h  |   22 ++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

New commits:
commit 86afada76e2048d39b78c7ff547cc0135f9a6920
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 29 17:54:28 2016 +0300

    Update bundled LibreOfficeKit include files from LO core master

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 0805e62..324318c 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -431,6 +431,29 @@ typedef enum
      */
     LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED,
 
+    /**
+     * An entry in the change tracking table has been modified.
+     *
+     * The payload example:
+     * {
+     *     "redline": {
+     *         "action": "Modify",
+     *         "index": "1",
+     *         "author": "Unknown Author",
+     *         "type": "Insert",
+     *         "comment": "",
+     *         "description": "Insert 'abcd'",
+     *         "dateTime": "2016-08-18T13:13:00"
+     *     }
+     * }
+     *
+     * The format is the same as an entry of
+     * lok::Document::getCommandValues('.uno:AcceptTrackedChanges'), extra
+     * fields:
+     *
+     * - 'action' is 'Modify'.
+     */
+    LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED,
 }
 LibreOfficeKitCallbackType;
 
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index bbef7d5..322ba8b 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -51,22 +51,34 @@ extern "C"
                       );
     }
 
-    inline char *lok_dlerror(void)
+#ifndef __OBJC__
+    inline
+#endif
+    char *lok_dlerror(void)
     {
         return dlerror();
     }
 
-    inline void *lok_dlsym(void *Hnd, const char *pName)
+#ifndef __OBJC__
+    inline
+#endif
+    void *lok_dlsym(void *Hnd, const char *pName)
     {
         return dlsym(Hnd, pName);
     }
 
-    inline int lok_dlclose(void *Hnd)
+#ifndef __OBJC__
+    inline
+#endif
+    int lok_dlclose(void *Hnd)
     {
         return dlclose(Hnd);
     }
 
-    inline void extendUnoPath(const char *pPath)
+#ifndef __OBJC__
+    inline
+#endif
+    void extendUnoPath(const char *pPath)
     {
         (void)pPath;
     }
@@ -146,7 +158,7 @@ static void *lok_dlopen( const char *install_path, char ** _imp_lib )
 
     *_imp_lib = NULL;
 
-#if !(defined(__APPLE__) && defined(__arm__))
+#if !(defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)))
     size_t partial_length;
 
     if (!install_path)