diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-01 09:59:43 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-03 10:45:02 +0200 |
commit | 54481a2d6a6f9d415e0979a03c0c878195a10845 (patch) | |
tree | aa6e89c31fdf8715b034a2b0ac01a335d399ea7f /sw/source/core/edit/edfcol.cxx | |
parent | 310923188c300ecc818fd442e0c7c7a4fe83044d (diff) |
Revert "tdf#125706 and tdf#125665 writer, speed up RDF"
This reverts commit 47e04cf31c6165dd55dc20962ad9c72962b958bd.
Because we are going to do this a better way.
Change-Id: Ic92d6fc471578973a141b6fd2be49fc38a9f55a5
Reviewed-on: https://gerrit.libreoffice.org/74991
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/edit/edfcol.cxx')
-rw-r--r-- | sw/source/core/edit/edfcol.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index a61964900a1d..4df464ee49ed 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -1157,14 +1157,12 @@ void SwEditShell::SetClassification(const OUString& rName, SfxClassificationPoli } } -// We pass xParent and xNodeSubject even though they point to the same thing because the UNO_QUERY is -// on a performance-sensitive path. static void lcl_ApplyParagraphClassification(SwDoc* pDoc, const uno::Reference<frame::XModel>& xModel, const uno::Reference<text::XTextContent>& xParent, - const css::uno::Reference<css::rdf::XResource>& xNodeSubject, std::vector<svx::ClassificationResult> aResults) { + css::uno::Reference<css::rdf::XResource> xNodeSubject(xParent, uno::UNO_QUERY); if (!xNodeSubject.is()) return; @@ -1281,7 +1279,7 @@ void SwEditShell::ApplyParagraphClassification(std::vector<svx::ClassificationRe uno::Reference<frame::XModel> xModel = pDocShell->GetBaseModel(); uno::Reference<text::XTextContent> xParent = SwXParagraph::CreateXParagraph(*pNode->GetDoc(), pNode); - lcl_ApplyParagraphClassification(GetDoc(), xModel, xParent, css::uno::Reference<css::rdf::XResource>(xParent, uno::UNO_QUERY), std::move(aResults)); + lcl_ApplyParagraphClassification(GetDoc(), xModel, xParent, std::move(aResults)); } static std::vector<svx::ClassificationResult> lcl_CollectParagraphClassification(const uno::Reference<frame::XModel>& xModel, const uno::Reference<text::XTextContent>& xParagraph) @@ -1989,7 +1987,7 @@ void SwEditShell::RestoreMetadataFieldsAndValidateParagraphSignatures() } // Update classification based on results. - lcl_ApplyParagraphClassification(GetDoc(), xModel, xParagraph, xSubject, aResults); + lcl_ApplyParagraphClassification(GetDoc(), xModel, xParagraph, aResults); // Get Signatures std::map<OUString, SignatureDescr> aSignatures; |