strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sw: use ForEachCharacterItem() in SwDoc::ForEachCharacterBoxItem()

Browse source 
Avoids a lot of duplication.

Change-Id: Ic929bf0add04228953d2536d2d753609b4203738
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174756
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna 2024-10-10 08:05:01 +02:00
parent f532894afd
commit e9dcbf84f9
1 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sw/source/core/doc/doc.cxx
View file

@ -1412,27 +1412,6 @@ void SwDoc::ForEachFormatURL( const std::function<bool(const SwFormatURL&)>& rFu
}
}
/// Iterate over all SwFormatURL, if the function returns false, iteration is stopped
void SwDoc::ForEachCharacterBoxItem( const std::function<bool(const SvxBoxItem&)>& rFunc ) const
{
for(SwCharFormat* pFormat : *GetCharFormats())
{
const SwAttrSet& rAttrSet = pFormat->GetAttrSet();
if (const SvxBoxItem* pBoxItem = rAttrSet.GetItemIfSet(RES_CHRATR_BOX))
if (!rFunc(*pBoxItem))
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 SvxBoxItem* pBoxItem = rxItemSet->GetItemIfSet(RES_CHRATR_BOX))
if (!rFunc(*pBoxItem))
return;
}
}
namespace
{
/// Iterate over all pool item of type T, if the function returns false, iteration is stopped
@ -1458,6 +1437,12 @@ void ForEachCharacterItem(const SwDoc* pDoc, TypedWhichId<T> nWhich, const std::
}
}
/// Iterate over all SwFormatURL, if the function returns false, iteration is stopped
void SwDoc::ForEachCharacterBoxItem( const std::function<bool(const SvxBoxItem&)>& rFunc ) const
{
ForEachCharacterItem(this, RES_CHRATR_BOX, rFunc);
}
/// Iterate over all SvxColorItem, if the function returns false, iteration is stopped
void SwDoc::ForEachCharacterColorItem( const std::function<bool(const SvxColorItem&)>& rFunc ) const
{