loolwsd/ChildProcessSession.cpp | 5 ---- loolwsd/LOKitClient.cpp | 1 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h | 12 ----------- loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h | 2 - loolwsd/protocol.txt | 12 ----------- loolwsd/test/httpwstest.cpp | 2 + 6 files changed, 3 insertions(+), 31 deletions(-)
New commits: commit 2590cd186e638af2ff0a164b3ea30fdb98037951 Author: Jan Holesovsky <[email protected]> Date: Thu Mar 3 11:13:34 2016 +0100 loolwsd: LOK_CALLBACK_PARTS_COUNT_CHANGED was removed from the API. diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp index 926b4dc..9df3d5a 100644 --- a/loolwsd/ChildProcessSession.cpp +++ b/loolwsd/ChildProcessSession.cpp @@ -110,8 +110,6 @@ public: return std::string("LOK_CALLBACK_DOCUMENT_SIZE_CHANGED"); case LOK_CALLBACK_SET_PART: return std::string("LOK_CALLBACK_SET_PART"); - case LOK_CALLBACK_PARTS_COUNT_CHANGED: - return std::string("LOK_CALLBACK_PARTS_COUNT_CHANGED"); case LOK_CALLBACK_DOCUMENT_PASSWORD: return std::string("LOK_CALLBACK_DOCUMENT_PASSWORD"); case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY: @@ -243,9 +241,6 @@ public: " kind=" + object->get("kind").toString() + " code=" + object->get("code").toString()); } break; - case LOK_CALLBACK_PARTS_COUNT_CHANGED: - _session.sendTextFrame("partscountchanged: " + rPayload); - break; } } diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp index cd52a1c..50cf3ec 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/protocol.txt b/loolwsd/protocol.txt index ab5142c..334be17 100644 --- a/loolwsd/protocol.txt +++ b/loolwsd/protocol.txt @@ -230,18 +230,6 @@ unocommandresult: <payload> Callback that an UNO command has finished. See LOK_CALLBACK_UNO_COMMAND_RESULT for details. -partscountchanged: action=<PartInserted|PartDeleted> part=<index> - - Callback action performed: - - PartInserted. The document parts has changed by the action - Insert. - - PartDeleted. The document parts has changed by the action - Delete. - - <index> The index of the part <PartInserted|PartDeleted> - child -> parent =============== diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp index 7ed1bb1..86d250a 100644 --- a/loolwsd/test/httpwstest.cpp +++ b/loolwsd/test/httpwstest.cpp @@ -355,6 +355,7 @@ void HTTPWSTest::testImpressPartCountChanged() CPPUNIT_ASSERT_EQUAL(totalParts, 1); } + /* FIXME partscountchanged: was removed, update accordingly // insert 10 slides for (unsigned it = 1; it <= 10; it++) { @@ -410,6 +411,7 @@ void HTTPWSTest::testImpressPartCountChanged() CPPUNIT_ASSERT(values["action"] == "PartDeleted"); } } + */ socket.shutdown(); } commit b442680d90775bdaf50852a55e5b49effed23ff1 Author: Jan Holesovsky <[email protected]> Date: Thu Mar 3 11:08: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 e855b6a..901bf6b 100644 --- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h +++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h @@ -280,18 +280,6 @@ typedef enum * } */ LOK_CALLBACK_ERROR, - - /** - * A part has been added to or removed from the document. - * - * { - * "action" : "PartInserted" | "PartDeleted" - * "part" : "Part Index" - * } - * - * Note: this is currently emitted by Impress. - */ - LOK_CALLBACK_PARTS_COUNT_CHANGED } LibreOfficeKitCallbackType; 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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
