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

[Bjoern Michaelsen (via logerrit)]

 sw/source/core/doc/DocumentFieldsManager.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f6bc31a95d8df117d481c0b34b996410fb186898
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Sun Mar 15 00:57:53 2020 +0100
Commit:     Björn Michaelsen <bjoern.michaelsen at libreoffice.org>
CommitDate: Sun Mar 15 02:24:09 2020 +0100

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

diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 39b0a76ff6de..88e0c6b7f018 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1735,10 +1735,11 @@ SwTextField * DocumentFieldsManager::GetTextFieldAtPos(const SwPosition & rPos)
 ///       optimization currently only available when no fields exist.
 bool DocumentFieldsManager::containsUpdatableFields()
 {
-    for (auto const & pFieldType : *mpFieldTypes)
+    std::vector<SwFormatField*> vFields;
+    for (auto const& pFieldType: *mpFieldTypes)
     {
-        SwIterator<SwFormatField,SwFieldType> aIter(*pFieldType);
-        if (aIter.First())
+        pFieldType->GatherFields(vFields);
+        if(vFields.size()>0)
             return true;
     }
     return false;