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

[Tor Lillqvist]

 loolwsd/LOOLSession.cpp                                      |    3 +
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |   22 ++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit 0053f18e2deb3f3c754cf24b17df32656e5a1e2a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat May 23 11:26:11 2015 +0100

    Handle LOK_CALLBACK_PAGE_COUNT_CHANGED

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index bdf5051..8551894 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -725,6 +725,9 @@ extern "C"
         case LOK_CALLBACK_SEARCH_NOT_FOUND:
             srv->sendTextFrame("searchnotfound: " + std::string(pPayload));
             break;
+        case LOK_CALLBACK_PAGE_COUNT_CHANGED:
+            srv->sendTextFrame("pagecountchanged:");
+            break;
         }
     }
 }
commit 25ecb6ce1686a62c45d9b2ef1dee6b694f0914f9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat May 23 11:25:42 2015 +0100

    Update from latest master

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index aaf99be..ba4db82 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -28,11 +28,8 @@ LibreOfficeKitDocumentType;
 
 typedef enum
 {
-    LOK_PARTMODE_DEFAULT,
-    LOK_PARTMODE_SLIDE,
-    LOK_PARTMODE_NOTES,
-    LOK_PARTMODE_SLIDENOTES,
-    LOK_PARTMODE_EMBEDDEDOBJ
+    LOK_PARTMODE_SLIDES,
+    LOK_PARTMODE_NOTES
 }
 LibreOfficeKitPartMode;
 
@@ -138,7 +135,20 @@ typedef enum
      *
      * Not necessarily ever emitted.
      */
-    LOK_CALLBACK_STATUS_INDICATOR_FINISH
+    LOK_CALLBACK_STATUS_INDICATOR_FINISH,
+
+    /**
+     * No match was found for the search input
+     */
+    LOK_CALLBACK_SEARCH_NOT_FOUND,
+
+    /**
+     * Number of pages changed in the document.
+     *
+     * Clients should assume that data returned by an earlier
+     * lok::Document::getDocumentSize() call is no longer valid.
+     */
+    LOK_CALLBACK_PAGE_COUNT_CHANGED
 }
 LibreOfficeKitCallbackType;