From 08f5b6d20deb4837b184de60b87643f703103829 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
Date: Sat, 7 Mar 2020 17:12:49 +0100
Subject: SwEditShell::IsAnyDatabaseFieldInDoc(): SwIterator no more ...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I58f3d546981ad80f8eeabab6b023c4a985f7aecb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90173
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
---
 sw/source/core/edit/edfld.cxx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index 54ee70970787..dd05535e4e9f 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -402,14 +402,9 @@ bool SwEditShell::IsAnyDatabaseFieldInDoc()const
                 case SwFieldIds::DbNumSet:
                 case SwFieldIds::DbSetNumber:
                 {
-                    SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
-                    SwFormatField* pField = aIter.First();
-                    while(pField)
-                    {
-                        if(pField->IsFieldInDoc())
-                            return true;
-                        pField = aIter.Next();
-                    }
+                    std::vector<SwFormatField*> vFields;
+                    pFieldType->GatherFields(vFields);
+                    return vFields.size();
                 }
                 break;
                 default: break;
-- 
cgit