diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-08-25 20:16:57 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-08-26 04:47:01 +0200 |
| commit | 0b698aa6eb26d75ca4baf677a461aee095f69317 (patch) | |
| tree | 74c45ae224b31919a97fc6e5f307df5a996c06ee /sw/source/core/model | |
| parent | 0484630164275e2828f1420b055f05e94b8c73ee (diff) | |
indexing: move xml parsing into SearchResultLocator
Let's keep unneeded complexity out of SwXTextDocument, so move
parsing into SearchResultLocator.
As a bonus we can now test parsing.
Change-Id: I944bfc43e6953523eee19b26b7f483aa401809aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121032
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sw/source/core/model')
| -rw-r--r-- | sw/source/core/model/ModelTraverser.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/model/SearchResultLocator.cxx | 50 |
2 files changed, 51 insertions, 0 deletions
diff --git a/sw/source/core/model/ModelTraverser.cxx b/sw/source/core/model/ModelTraverser.cxx index 0a01f5cd97c5..bb959a95dec6 100644 --- a/sw/source/core/model/ModelTraverser.cxx +++ b/sw/source/core/model/ModelTraverser.cxx @@ -24,6 +24,7 @@ void ModelTraverser::traverse() auto const& pNodes = m_pDoc->GetNodes(); SwNode* pNode = nullptr; + for (sal_uLong n = 0; n < pNodes.Count(); ++n) { pNode = pNodes[n]; diff --git a/sw/source/core/model/SearchResultLocator.cxx b/sw/source/core/model/SearchResultLocator.cxx index 0b91c7a507e9..a0e405b2ed33 100644 --- a/sw/source/core/model/SearchResultLocator.cxx +++ b/sw/source/core/model/SearchResultLocator.cxx @@ -17,6 +17,9 @@ #include <IDocumentDrawModelAccess.hxx> #include <IDocumentLayoutAccess.hxx> +#include <tools/XmlWalker.hxx> +#include <tools/stream.hxx> + #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> @@ -82,6 +85,53 @@ LocationResult SearchResultLocator::find(std::vector<SearchIndexData> const& rSe return aResult; } +LocationResult SearchResultLocator::findForPayload(const char* pPayload) +{ + LocationResult aResult; + + const OString aPayloadString(pPayload); + + SvMemoryStream aStream(const_cast<char*>(aPayloadString.getStr()), aPayloadString.getLength(), + StreamMode::READ); + tools::XmlWalker aWalker; + + if (!aWalker.open(&aStream)) + return aResult; + + if (aWalker.name() == "indexing") + { + std::vector<sw::search::SearchIndexData> aDataVector; + aWalker.children(); + while (aWalker.isValid()) + { + if (aWalker.name() == "paragraph") + { + OString sType = aWalker.attribute("type"); + OString sIndex = aWalker.attribute("index"); + + if (!sType.isEmpty() && !sIndex.isEmpty()) + { + sw::search::SearchIndexData aData; + aData.mnNodeIndex = sIndex.toInt32(); + aData.meType = sw::search::NodeType(sType.toInt32()); + + aDataVector.push_back(aData); + } + } + aWalker.next(); + } + aWalker.parent(); + + if (!aDataVector.empty()) + { + for (auto const& rSearchIndexData : aDataVector) + findOne(aResult, rSearchIndexData); + } + } + + return aResult; +} + } // end sw namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |