[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loolwsd/bundled loolwsd/LOKitClient.cpp loolwsd/LOOLSession.cpp

[Jan Holesovsky]

 loolwsd/LOKitClient.cpp                                      |    1 -
 loolwsd/LOOLSession.cpp                                      |    2 --
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |    1 +
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h  |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c3e3cf58ebb7daa67d4c1dc9a25a88f41ab31323
Author: Jan Holesovsky <ke...@collabora.com>
Date:   Thu Mar 3 11:20:20 2016 +0100

    loolwsd: LOK_CALLBACK_PARTS_COUNT_CHANGED was removed from the API.

diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index b02c062..9542942 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -67,7 +67,6 @@ extern "C"
             CASE(DOCUMENT_PASSWORD);
             CASE(DOCUMENT_PASSWORD_TO_MODIFY);
             CASE(ERROR);
-            CASE(PARTS_COUNT_CHANGED);
 #undef CASE
         }
         std::cout << " payload: " << pPayload << std::endl;
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 506fd64..a77df51 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -1085,8 +1085,6 @@ extern "C"
                         " kind=" + object->get("kind").toString() + " code=" + 
object->get("code").toString());
             }
             break;
-        case LOK_CALLBACK_PARTS_COUNT_CHANGED:
-            break;
         }
     }
 }
commit 48d2fe6d8b2409fbeaaf895f15772f0a597447d4
Author: Jan Holesovsky <ke...@collabora.com>
Date:   Thu Mar 3 11:18:25 2016 +0100

    loolwsd: Update the bundled LOK headers.

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 5ce8610..901bf6b 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -197,6 +197,7 @@ typedef enum
      *
      * {
      *     "searchString": "...",
+     *     "highlightAll": true|false, // this is a result of 'search all'
      *     "searchResultSelection": [
      *         {
      *             "part": "...",
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index 23e5772..a1b2ddc 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -19,7 +19,7 @@ extern "C"
 
 #if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) ||\
     defined(_WIN32) || defined(__APPLE__) || defined (__NetBSD__) ||\
-    defined (__sun)
+    defined (__sun) || defined(__OpenBSD__)
 
 #include <stdio.h>
 #include <stdlib.h>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits