[Libreoffice-commits] core.git: sw/source

[Bjoern Michaelsen (via logerrit)]

 sw/source/core/doc/doctxm.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 900e29250fba8aff807b99e684fdd4f73f866132
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Sun Mar 15 01:11:49 2020 +0100
Commit:     Björn Michaelsen <bjoern.michaelsen at libreoffice.org>
CommitDate: Sun Mar 15 02:27:51 2020 +0100

    SwTOXBaseSection::UpdateSequence(): SwIterator no more ...
    
    Change-Id: I3b52e980d75a27d9ef9f66b4672cf4e52e7d297d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90507
    Tested-by: Jenkins
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index bd952576f6ae..eb8b7dcd95d7 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1316,18 +1316,16 @@ void SwTOXBaseSection::UpdateSequence(const SwTextNode* pOwnChapterNode,
     if(!pSeqField)
         return;
 
-    SwIterator<SwFormatField,SwFieldType> aIter( *pSeqField );
-    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
+    std::vector<SwFormatField*> vFields;
+    pSeqField->GatherFields(vFields);
+    for(auto pFormatField: vFields)
     {
         const SwTextField* pTextField = pFormatField->GetTextField();
-        if(!pTextField)
-            continue;
         SwTextNode& rTextNode = pTextField->GetTextNode();
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
         if (rTextNode.GetText().getLength() &&
             rTextNode.getLayoutFrame(pLayout) &&
-            rTextNode.GetNodes().IsDocNodes() &&
             ( !IsFromChapter() ||
                 ::lcl_FindChapterNode(rTextNode, pLayout) == pOwnChapterNode)
             && (!pLayout || !pLayout->IsHideRedlines()