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

[Miklos Vajna]

 loolwsd/LOKitClient.cpp                                      |    1 -
 loolwsd/LOOLSession.cpp                                      |    3 ---
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |    6 ------
 3 files changed, 10 deletions(-)

New commits:
commit 677de915ffa277702bb662ed050aabe40fbd697f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Oct 13 14:54:59 2015 +0200

    loolwsd: remove redundant LOK_CALLBACK_SEARCH_RESULT_COUNT handling

diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index 8e3f546..d8ea3f0 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -57,7 +57,6 @@ extern "C"
             CASE(STATUS_INDICATOR_SET_VALUE);
             CASE(STATUS_INDICATOR_FINISH);
             CASE(SEARCH_NOT_FOUND);
-            CASE(SEARCH_RESULT_COUNT);
             CASE(SEARCH_RESULT_SELECTION);
             CASE(DOCUMENT_SIZE_CHANGED);
             CASE(SET_PART);
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 9f4a54c..cf7e3a3 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -815,9 +815,6 @@ extern "C"
         case LOK_CALLBACK_HYPERLINK_CLICKED:
             srv->sendTextFrame("hyperlinkclicked: " + std::string(pPayload));
             break;
-        case LOK_CALLBACK_SEARCH_RESULT_COUNT:
-            srv->sendTextFrame("searchresultcount: " + std::string(pPayload));
-            break;
         case LOK_CALLBACK_STATE_CHANGED:
             srv->sendTextFrame("statechanged: " + std::string(pPayload));
             break;
commit d19f483085437da92d6da8e0a67cea05e1847f8e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Oct 13 14:53:30 2015 +0200

    loolwsd: update the bundled headers

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index b87f69a..0da8769 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -158,12 +158,6 @@ typedef enum
     LOK_CALLBACK_SET_PART,
 
     /**
-     * Number of search results followed by the original searched phrase.
-     * count;phrase
-     */
-    LOK_CALLBACK_SEARCH_RESULT_COUNT,
-
-    /**
      * Selection rectangles of the search result when find all is performed.
      *
      * Payload format example, in case of two matches: