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

[Bjoern Michaelsen (via logerrit)]

 sw/source/core/crsr/crstrvl.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b324e250eba39292ded7709517e0db2d5b99f3b8
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Sun Mar 15 00:21:01 2020 +0100
Commit:     Björn Michaelsen <bjoern.michaelsen at libreoffice.org>
CommitDate: Sun Mar 15 02:21:52 2020 +0100

    crstrvl.cxx: SwIterator no more ...
    
    Change-Id: Id92053b2d4310dc684ab1e51f8fdf6c2a0e2c62e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90502
    Tested-by: Jenkins
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 5a53b39bbe06..79cd6551bc4e 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -654,11 +654,11 @@ static void lcl_MakeFieldLst(
 {
     // always search the 1. frame
     Point aPt;
-    SwTextField* pTextField = nullptr;
-    SwIterator<SwFormatField,SwFieldType> aIter(rFieldType);
-    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
+    std::vector<SwFormatField*> vFields;
+    rFieldType.GatherFields(vFields, false);
+    for(SwFormatField* pFormatField: vFields)
     {
-        pTextField = pFormatField->GetTextField();
+        SwTextField* pTextField = pFormatField->GetTextField();
         if ( pTextField != nullptr
              && ( !bChkInpFlag
                   || static_cast<const SwSetExpField*>(pTextField->GetFormatField().GetField())->GetInputFlag() ) )