core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/doc/doc.cxx |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

New commits:
commit 8a6919f39b4b871904a2a4199755ca619aa707e2
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Oct 11 08:29:09 2024 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Oct 11 23:08:33 2024 +0200

    sw: use ForEachCharacterItem() in SwDoc::ForEachCharacterBrushItem()
    
    Avoids a lot of duplication.
    
    Change-Id: I6f743054b3ea09a6c945006fc2298514b04809e2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174802
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index a264090a92e9..e19cfa10dc71 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1458,22 +1458,7 @@ void SwDoc::ForEachCharacterUnderlineItem( const 
std::function<bool(const SvxUnd
 /// Iterate over all SvxBrushItem, if the function returns false, iteration is 
stopped
 void SwDoc::ForEachCharacterBrushItem( const std::function<bool(const 
SvxBrushItem&)>& rFunc ) const
 {
-    for(SwCharFormat* pFormat : *GetCharFormats())
-    {
-        const SwAttrSet& rAttrSet = pFormat->GetAttrSet();
-        if (const SvxBrushItem* pItem = 
rAttrSet.GetItemIfSet(RES_CHRATR_BACKGROUND))
-            if (!rFunc(*pItem))
-                return;
-    }
-    std::vector<std::shared_ptr<SfxItemSet>> aStyles;
-    for (auto eFamily : { IStyleAccess::AUTO_STYLE_CHAR, 
IStyleAccess::AUTO_STYLE_RUBY, IStyleAccess::AUTO_STYLE_PARA, 
IStyleAccess::AUTO_STYLE_NOTXT })
-    {
-        const_cast<SwDoc*>(this)->GetIStyleAccess().getAllStyles(aStyles, 
eFamily);
-        for (const auto & rxItemSet : aStyles)
-            if (const SvxBrushItem* pItem = 
rxItemSet->GetItemIfSet(RES_CHRATR_BACKGROUND))
-                if (!rFunc(*pItem))
-                    return;
-    }
+    ForEachCharacterItem(this, RES_CHRATR_BACKGROUND, rFunc);
 }
 
 /// Iterate over all RES_TXTATR_UNKNOWN_CONTAINER SvXMLAttrContainerItem, if 
the function returns false, iteration is stopped