[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - include/LibreOfficeKit sw/qa sw/source

[Miklos Vajna]

 include/LibreOfficeKit/LibreOfficeKitEnums.h   |    6 ------
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   12 +-----------
 sw/source/uibase/uiview/viewsrch.cxx           |   14 +++++---------
 3 files changed, 6 insertions(+), 26 deletions(-)

New commits:
commit 0905209e14b41d87838605cf2eeefd50ca0b8d78
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Oct 9 08:08:48 2015 +0200

    LOK: CALLBACK_SEARCH_RESULT_COUNT is redundant
    
    1) The size of the searchResultSelection array in
    LOK_CALLBACK_SEARCH_RESULT_SELECTION provides the same information.
    
    2) None of the clients except lokdocview used it.
    
    3) Only sw provided this callback, not sc/sd.
    
    (cherry picked from commit f0e3fe840b6f103c589f044bbde18b2faa345279)
    
    Conflicts:
    	libreofficekit/source/gtk/lokdocview.cxx
    
    Change-Id: I9da639b6693f24634f298f9bc4773f705e944359

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 39a324e..fbe3c1b 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -161,12 +161,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:
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 1eb57de..eb59b62 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -72,13 +72,11 @@ private:
     Size m_aDocumentSize;
     OString m_aTextSelection;
     bool m_bFound;
-    sal_Int32 m_nSearchResultCount;
     std::vector<OString> m_aSearchResultSelection;
 };
 
 SwTiledRenderingTest::SwTiledRenderingTest()
-    : m_bFound(true),
-      m_nSearchResultCount(0)
+    : m_bFound(true)
 {
 }
 
@@ -134,12 +132,6 @@ void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload)
         m_bFound = false;
     }
     break;
-    case LOK_CALLBACK_SEARCH_RESULT_COUNT:
-    {
-        std::string aStrPayload(pPayload);
-        m_nSearchResultCount = std::stoi(aStrPayload.substr(0, aStrPayload.find_first_of(";")));
-    }
-    break;
     case LOK_CALLBACK_SEARCH_RESULT_SELECTION:
     {
         m_aSearchResultSelection.clear();
@@ -485,8 +477,6 @@ void SwTiledRenderingTest::testSearchAll()
     }));
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
     // This was 0; should be 2 results in the body text.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), m_nSearchResultCount);
-    // Make sure that we get exactly as many rectangle lists as matches.
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), m_aSearchResultSelection.size());
 
     comphelper::LibreOfficeKit::setActive(false);
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 6879dad..c0a0458 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -104,11 +104,8 @@ static void lcl_addContainerToJson(boost::property_tree::ptree& rTree, const OSt
 }
 
 /// Emits LOK callbacks (count, selection) for search results.
-static void lcl_emitSearchResultCallbacks(sal_uInt16 nFound, SvxSearchItem* pSearchItem, SwWrtShell* pWrtShell)
+static void lcl_emitSearchResultCallbacks(SvxSearchItem* pSearchItem, SwWrtShell* pWrtShell)
 {
-    OString aPayload = OString::number(nFound) + ";" + pSearchItem->GetSearchString().toUtf8();
-    pWrtShell->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_RESULT_COUNT, aPayload.getStr());
-
     // Emit a callback also about the selection rectangles, grouped by matches.
     if (SwPaM* pPaM = pWrtShell->GetCrsr())
     {
@@ -137,7 +134,7 @@ static void lcl_emitSearchResultCallbacks(sal_uInt16 nFound, SvxSearchItem* pSea
 
         std::stringstream aStream;
         boost::property_tree::write_json(aStream, aTree);
-        aPayload = aStream.str().c_str();
+        OString aPayload = aStream.str().c_str();
 
         pWrtShell->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_RESULT_SELECTION, aPayload.getStr());
     }
@@ -252,7 +249,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
                 {
                     Scroll(m_pWrtShell->GetCharRect().SVRect());
                     if (comphelper::LibreOfficeKit::isActive())
-                        lcl_emitSearchResultCallbacks(1, m_pSrchItem, m_pWrtShell);
+                        lcl_emitSearchResultCallbacks(m_pSrchItem, m_pWrtShell);
                 }
                 rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
 #if HAVE_FEATURE_DESKTOP
@@ -271,8 +268,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
             break;
             case SvxSearchCmd::FIND_ALL:
             {
-                sal_uInt16 nFound = 0;
-                bool bRet = SearchAll(&nFound);
+                bool bRet = SearchAll();
                 if( !bRet )
                 {
 #if HAVE_FEATURE_DESKTOP
@@ -286,7 +282,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
                     m_bFound = false;
                 }
                 else if (comphelper::LibreOfficeKit::isActive())
-                    lcl_emitSearchResultCallbacks(nFound, m_pSrchItem, m_pWrtShell);
+                    lcl_emitSearchResultCallbacks(m_pSrchItem, m_pWrtShell);
                 rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
 #if HAVE_FEATURE_DESKTOP
                 {