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

[Miklos Vajna]

 loolwsd/LOKitClient.cpp                                      |    1 
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h      |    8 ++---
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |   16 +++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit b9fbc6d36917bda3579ac51e1cdf45a42e062150
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jul 22 18:09:32 2016 +0200

    Update bundled headers

diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index 83c4075..df36a49 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -72,6 +72,7 @@ extern "C"
             CASE(CELL_VIEW_CURSOR);
             CASE(GRAPHIC_VIEW_SELECTION);
             CASE(VIEW_CURSOR_VISIBLE);
+            CASE(VIEW_LOCK);
 #undef CASE
         }
         std::cout << " payload: " << pPayload << std::endl;
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 559d28a..81d65c1 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -212,13 +212,13 @@ struct _LibreOfficeKitDocumentClass
     void (*setClientVisibleArea) (LibreOfficeKitDocument* pThis, int nX, int nY, int nWidth, int nHeight);
 
     /// @see lok::Document::createView().
-    uintptr_t (*createView) (LibreOfficeKitDocument* pThis);
+    int (*createView) (LibreOfficeKitDocument* pThis);
     /// @see lok::Document::destroyView().
-    void (*destroyView) (LibreOfficeKitDocument* pThis, uintptr_t nId);
+    void (*destroyView) (LibreOfficeKitDocument* pThis, int nId);
     /// @see lok::Document::setView().
-    void (*setView) (LibreOfficeKitDocument* pThis, uintptr_t nId);
+    void (*setView) (LibreOfficeKitDocument* pThis, int nId);
     /// @see lok::Document::getView().
-    uintptr_t (*getView) (LibreOfficeKitDocument* pThis);
+    int (*getView) (LibreOfficeKitDocument* pThis);
     /// @see lok::Document::getViews().
     int (*getViews) (LibreOfficeKitDocument* pThis);
 
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 63abda8..651e9bc 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -390,6 +390,22 @@ typedef enum
      */
     LOK_CALLBACK_VIEW_CURSOR_VISIBLE,
 
+    /**
+     * The size and/or the position of a lock rectangle in one of the other
+     * views has changed.
+     *
+     * The payload format:
+     *
+     * {
+     *     "viewId": "..."
+     *     "rectangle": "..."
+     * }
+     *
+     * - viewId is a value returned earlier by lok::Document::createView()
+     * - rectangle uses the format of LOK_CALLBACK_INVALIDATE_TILES.
+     */
+    LOK_CALLBACK_VIEW_LOCK,
+
 }
 LibreOfficeKitCallbackType;