summaryrefslogtreecommitdiff
path: root/sw/qa/extras/tiledrendering/tiledrendering.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-10-09 08:08:48 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-10-09 08:09:16 +0200
commitf0e3fe840b6f103c589f044bbde18b2faa345279 (patch)
treed8049ca5c6695ab1d20b1d21b4985bae1a749780 /sw/qa/extras/tiledrendering/tiledrendering.cxx
parent854af5a574a9d0d3e8e56f83c4853cfad872f456 (diff)
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. Change-Id: I9da639b6693f24634f298f9bc4773f705e944359
Diffstat (limited to 'sw/qa/extras/tiledrendering/tiledrendering.cxx')
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx12
1 files changed, 1 insertions, 11 deletions
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 1eb57dea109e..eb59b62b9208 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);