sw/source/core/text/EnhancedPDFExportHelper.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit 81dfc7afcdc473bd655ff64038e8a449a9999c0c Author: Devashish Gupta <ashishkrgupta.haji...@gmail.com> AuthorDate: Thu Mar 20 17:21:47 2025 +0530 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Fri Mar 21 21:30:26 2025 +0100 tdf#158237 Use C++20 contains() instead of find() and end() Change-Id: Ieb5d3ee0ade0f9657722e05132d260c304de5410 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183168 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 517b32171d4a..74b3aa7b7574 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -567,7 +567,7 @@ bool SwTaggedPDFHelper::CheckReopenTag() { void const*const pKey = lcl_GetKeyFromFrame(*pKeyFrame); FrameTagSet& rFrameTagSet(mpPDFExtOutDevData->GetSwPDFState()->m_FrameTagSet); - if (rFrameTagSet.find(pKey) != rFrameTagSet.end() + if (rFrameTagSet.contains(pKey) || rFrame.IsFlyFrame()) // for hell layer flys { pReopenKey = pKey; @@ -654,7 +654,7 @@ void SwTaggedPDFHelper::BeginTag(vcl::pdf::StructElement eType, const OUString& if (pKey) { FrameTagSet& rFrameTagSet(mpPDFExtOutDevData->GetSwPDFState()->m_FrameTagSet); - assert(rFrameTagSet.find(pKey) == rFrameTagSet.end()); + assert(!rFrameTagSet.contains(pKey)); rFrameTagSet.emplace(pKey); } } @@ -1461,7 +1461,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() } FrameTagSet& rFrameTagSet(mpPDFExtOutDevData->GetSwPDFState()->m_FrameTagSet); - if (rFrameTagSet.find(pSection) != rFrameTagSet.end()) + if (rFrameTagSet.contains(pSection)) { // special case: section may have *multiple* master frames, // when it is interrupted by nested section - reopen! @@ -1573,7 +1573,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if (pTabFrame) { const SwTable* pTable = pTabFrame->GetTable(); - if (rTableCaptionsMap.find(pTable) != rTableCaptionsMap.end()) + if (rTableCaptionsMap.contains(pTable)) { // Reopen Caption tag: // - if the table has an above and below caption