|
 |
f325b2 |
From 418c00d936bad7f4ecc59fc5246a51218026e983 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 6 Oct 2015 14:17:43 +0200
|
|
|
f325b2 |
Subject: [PATCH 186/398] sw tiled rendering: emit LOK_CALLBACK_SEARCH_RESULT*
|
|
|
f325b2 |
for normal search
|
|
|
f325b2 |
|
|
|
f325b2 |
We used to emit these for find-all only, for no good reason.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Id07dc7649f9a8528b9d4ec16d5f7c651fd607111
|
|
|
f325b2 |
(cherry picked from commit 58c38e7ea5debc5440f1d81acf38d8d6ad0883d8)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sw/qa/extras/tiledrendering/tiledrendering.cxx | 7 +++++++
|
|
|
f325b2 |
sw/source/uibase/uiview/viewsrch.cxx | 4 ++++
|
|
|
f325b2 |
2 files changed, 11 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
|
|
|
f325b2 |
index 2fd27dd4f8ff..1eb57dea109e 100644
|
|
|
f325b2 |
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
|
|
|
f325b2 |
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
|
|
|
f325b2 |
@@ -342,7 +342,10 @@ void lcl_search(bool bBackward)
|
|
|
f325b2 |
void SwTiledRenderingTest::testSearch()
|
|
|
f325b2 |
{
|
|
|
f325b2 |
#if !defined(WNT) && !defined(MACOSX)
|
|
|
f325b2 |
+ comphelper::LibreOfficeKit::setActive();
|
|
|
f325b2 |
+
|
|
|
f325b2 |
SwXTextDocument* pXTextDocument = createDoc("search.odt");
|
|
|
f325b2 |
+ pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this);
|
|
|
f325b2 |
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
|
|
|
f325b2 |
size_t nNode = pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -351,6 +354,8 @@ void SwTiledRenderingTest::testSearch()
|
|
|
f325b2 |
CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
|
|
|
f325b2 |
size_t nActual = pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
|
|
|
f325b2 |
CPPUNIT_ASSERT_EQUAL(nNode + 1, nActual);
|
|
|
f325b2 |
+ /// Make sure we get search result selection for normal find as well, not only find all.
|
|
|
f325b2 |
+ CPPUNIT_ASSERT(!m_aSearchResultSelection.empty());
|
|
|
f325b2 |
|
|
|
f325b2 |
// Next hit, in the shape.
|
|
|
f325b2 |
lcl_search(false);
|
|
|
f325b2 |
@@ -375,6 +380,8 @@ void SwTiledRenderingTest::testSearch()
|
|
|
f325b2 |
CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
|
|
|
f325b2 |
nActual = pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
|
|
|
f325b2 |
CPPUNIT_ASSERT_EQUAL(nNode + 1, nActual);
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ comphelper::LibreOfficeKit::setActive(false);
|
|
|
f325b2 |
#endif
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
|
|
|
f325b2 |
index a22cbdb6528f..c8d3e7a571ea 100644
|
|
|
f325b2 |
--- a/sw/source/uibase/uiview/viewsrch.cxx
|
|
|
f325b2 |
+++ b/sw/source/uibase/uiview/viewsrch.cxx
|
|
|
f325b2 |
@@ -253,7 +253,11 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
bool bRet = SearchAndWrap(bApi);
|
|
|
f325b2 |
if( bRet )
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
Scroll(m_pWrtShell->GetCharRect().SVRect());
|
|
|
f325b2 |
+ if (comphelper::LibreOfficeKit::isActive())
|
|
|
f325b2 |
+ lcl_emitSearchResultCallbacks(1, m_pSrchItem, m_pWrtShell);
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
|
|
|
f325b2 |
#if HAVE_FEATURE_DESKTOP
|
|
|
f325b2 |
{
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|