Blame SOURCES/0208-LOK-include-part-numbers-in-CALLBACK_SEARCH_RESULT_S.patch

135360
From 5cfe5701f287fcceee39cd2eb8ed403cda6eeea4 Mon Sep 17 00:00:00 2001
135360
From: Miklos Vajna <vmiklos@collabora.co.uk>
135360
Date: Wed, 14 Oct 2015 15:39:07 +0200
135360
Subject: [PATCH 208/398] LOK: include part numbers in
135360
 CALLBACK_SEARCH_RESULT_SELECTION payload
135360
135360
Without that, the result in Calc/Impress is ambiguous.
135360
135360
Change-Id: I8dfd8dafc996102ed583688fddd721c7600dc48c
135360
(cherry picked from commit ad280b67f8fda8f832a6a83bc5665df448c6ad00)
135360
---
135360
 desktop/qa/desktop_lib/test_desktop_lib.cxx    |  8 +++++++-
135360
 include/LibreOfficeKit/LibreOfficeKitEnums.h   | 14 ++++++++++----
135360
 sc/source/ui/view/viewfun2.cxx                 |  3 ++-
135360
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |  9 ++++++++-
135360
 sd/source/ui/view/Outliner.cxx                 |  6 ++++--
135360
 sw/qa/extras/tiledrendering/tiledrendering.cxx |  8 +++++++-
135360
 sw/source/uibase/uiview/viewsrch.cxx           |  3 ++-
135360
 7 files changed, 40 insertions(+), 11 deletions(-)
135360
135360
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
135360
index e77bc8984bbf..30d8ae7adaf0 100644
135360
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
135360
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
135360
@@ -74,6 +74,7 @@ public:
135360
     uno::Reference<lang::XComponent> mxComponent;
135360
     OString m_aTextSelection;
135360
     std::vector<OString> m_aSearchResultSelection;
135360
+    std::vector<int> m_aSearchResultPart;
135360
 };
135360
 
135360
 LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName, LibreOfficeKitDocumentType eType)
135360
@@ -131,7 +132,10 @@ void DesktopLOKTest::callbackImpl(int nType, const char* pPayload)
135360
         std::stringstream aStream(pPayload);
135360
         boost::property_tree::read_json(aStream, aTree);
135360
         for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("searchResultSelection"))
135360
-            m_aSearchResultSelection.push_back(rValue.second.data().c_str());
135360
+        {
135360
+            m_aSearchResultSelection.push_back(rValue.second.get<std::string>("rectangles").c_str());
135360
+            m_aSearchResultPart.push_back(std::atoi(rValue.second.get<std::string>("part").c_str()));
135360
+        }
135360
     }
135360
     break;
135360
     }
135360
@@ -269,6 +273,8 @@ void DesktopLOKTest::testSearchCalc()
135360
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), aSelections.size());
135360
     // Make sure that we get exactly as many rectangle lists as matches.
135360
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), m_aSearchResultSelection.size());
135360
+    // Result is on the first sheet.
135360
+    CPPUNIT_ASSERT_EQUAL(0, m_aSearchResultPart[0]);
135360
 
135360
     closeDoc();
135360
     comphelper::LibreOfficeKit::setActive(false);
135360
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
135360
index 0da87699b1b5..459da5d196f4 100644
135360
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
135360
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
135360
@@ -165,14 +165,20 @@ typedef enum
135360
      * {
135360
      *     "searchString": "...",
135360
      *     "searchResultSelection": [
135360
-     *         "...",
135360
-     *         "..."
135360
+     *         {
135360
+     *             "part": "...",
135360
+     *             "rectangles": "..."
135360
+     *         },
135360
+     *         {
135360
+     *             "part": "...",
135360
+     *             "rectangles": "..."
135360
+     *         }
135360
      *     ]
135360
      * }
135360
      *
135360
      * - searchString is the search query
135360
-     * - searchResultSelection is an array of rectangle list, in
135360
-     *   LOK_CALLBACK_TEXT_SELECTION format.
135360
+     * - searchResultSelection is an array of part-number and rectangle list
135360
+     *   pairs, in LOK_CALLBACK_SET_PART / LOK_CALLBACK_TEXT_SELECTION format.
135360
      */
135360
     LOK_CALLBACK_SEARCH_RESULT_SELECTION
135360
 }
135360
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
135360
index 2be84a4c8e39..95fd13a1bf93 100644
135360
--- a/sc/source/ui/view/viewfun2.cxx
135360
+++ b/sc/source/ui/view/viewfun2.cxx
135360
@@ -1866,7 +1866,8 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
135360
                 for (const Rectangle& rLogicRect : aLogicRects)
135360
                 {
135360
                     boost::property_tree::ptree aSelection;
135360
-                    aSelection.put("", rLogicRect.toString().getStr());
135360
+                    aSelection.put("part", OString::number(nTab).getStr());
135360
+                    aSelection.put("rectangles", rLogicRect.toString().getStr());
135360
                     aSelections.push_back(std::make_pair("", aSelection));
135360
                 }
135360
                 aTree.add_child("searchResultSelection", aSelections);
135360
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
135360
index f35449b12b2c..62ad1cdcad7e 100644
135360
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
135360
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
135360
@@ -80,6 +80,7 @@ private:
135360
     bool m_bFound;
135360
     sal_Int32 m_nPart;
135360
     std::vector<OString> m_aSearchResultSelection;
135360
+    std::vector<int> m_aSearchResultPart;
135360
 #endif
135360
 };
135360
 
135360
@@ -187,11 +188,15 @@ void SdTiledRenderingTest::callbackImpl(int nType, const char* pPayload)
135360
     case LOK_CALLBACK_SEARCH_RESULT_SELECTION:
135360
     {
135360
         m_aSearchResultSelection.clear();
135360
+        m_aSearchResultPart.clear();
135360
         boost::property_tree::ptree aTree;
135360
         std::stringstream aStream(pPayload);
135360
         boost::property_tree::read_json(aStream, aTree);
135360
         for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("searchResultSelection"))
135360
-            m_aSearchResultSelection.push_back(rValue.second.data().c_str());
135360
+        {
135360
+            m_aSearchResultSelection.push_back(rValue.second.get<std::string>("rectangles").c_str());
135360
+            m_aSearchResultPart.push_back(std::atoi(rValue.second.get<std::string>("part").c_str()));
135360
+        }
135360
     }
135360
     break;
135360
     }
135360
@@ -401,6 +406,8 @@ void SdTiledRenderingTest::testSearch()
135360
     CPPUNIT_ASSERT_EQUAL(true, m_bFound);
135360
     // This was 0; should be 1 match for "find".
135360
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), m_aSearchResultSelection.size());
135360
+    // Result is on the second slide.
135360
+    CPPUNIT_ASSERT_EQUAL(1, m_aSearchResultPart[0]);
135360
 
135360
     // This should trigger the not-found callback.
135360
     Application::EnableHeadlessMode(false);
135360
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
135360
index 22db187ab7c8..51635d5cba14 100644
135360
--- a/sd/source/ui/view/Outliner.cxx
135360
+++ b/sd/source/ui/view/Outliner.cxx
135360
@@ -643,7 +643,8 @@ bool Outliner::SearchAndReplaceAll()
135360
             for (const SearchSelection& rSelection : aSelections)
135360
             {
135360
                 boost::property_tree::ptree aChild;
135360
-                aChild.put("", rSelection.m_aRectangles.getStr());
135360
+                aChild.put("part", OString::number(rSelection.m_nPage).getStr());
135360
+                aChild.put("rectangles", rSelection.m_aRectangles.getStr());
135360
                 aChildren.push_back(std::make_pair("", aChild));
135360
             }
135360
             aTree.add_child("searchResultSelection", aChildren);
135360
@@ -770,7 +771,8 @@ bool Outliner::SearchAndReplaceOnce(std::vector<SearchSelection>* pSelections)
135360
 
135360
             boost::property_tree::ptree aChildren;
135360
             boost::property_tree::ptree aChild;
135360
-            aChild.put("", sRectangles.getStr());
135360
+            aChild.put("part", OString::number(maCurrentPosition.mnPageIndex).getStr());
135360
+            aChild.put("rectangles", sRectangles.getStr());
135360
             aChildren.push_back(std::make_pair("", aChild));
135360
             aTree.add_child("searchResultSelection", aChildren);
135360
 
135360
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
135360
index 5e2b30ab7fde..4598c50e5842 100644
135360
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
135360
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
135360
@@ -72,6 +72,7 @@ private:
135360
     OString m_aTextSelection;
135360
     bool m_bFound;
135360
     std::vector<OString> m_aSearchResultSelection;
135360
+    std::vector<int> m_aSearchResultPart;
135360
 };
135360
 
135360
 SwTiledRenderingTest::SwTiledRenderingTest()
135360
@@ -138,7 +139,10 @@ void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload)
135360
         std::stringstream aStream(pPayload);
135360
         boost::property_tree::read_json(aStream, aTree);
135360
         for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("searchResultSelection"))
135360
-            m_aSearchResultSelection.push_back(rValue.second.data().c_str());
135360
+        {
135360
+            m_aSearchResultSelection.push_back(rValue.second.get<std::string>("rectangles").c_str());
135360
+            m_aSearchResultPart.push_back(std::atoi(rValue.second.get<std::string>("part").c_str()));
135360
+        }
135360
     }
135360
     break;
135360
     }
135360
@@ -477,6 +481,8 @@ void SwTiledRenderingTest::testSearchAll()
135360
     comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
135360
     // This was 0; should be 2 results in the body text.
135360
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), m_aSearchResultSelection.size());
135360
+    // Writer documents are always a single part.
135360
+    CPPUNIT_ASSERT_EQUAL(0, m_aSearchResultPart[0]);
135360
 
135360
     comphelper::LibreOfficeKit::setActive(false);
135360
 #endif
135360
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
135360
index 7f1addcc3f6b..53485eb9361b 100644
135360
--- a/sw/source/uibase/uiview/viewsrch.cxx
135360
+++ b/sw/source/uibase/uiview/viewsrch.cxx
135360
@@ -95,7 +95,8 @@ static void lcl_addContainerToJson(boost::property_tree::ptree& rTree, const OSt
135360
     for (const OString& rMatch : rMatches)
135360
     {
135360
         boost::property_tree::ptree aChild;
135360
-        aChild.put("", rMatch.getStr());
135360
+        aChild.put("part", "0");
135360
+        aChild.put("rectangles", rMatch.getStr());
135360
         aChildren.push_back(std::make_pair("", aChild));
135360
     }
135360
 
135360
-- 
135360
2.12.0
135360