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

tdf#158556 make SvxBrushItem hashable

Browse source 
Change-Id: I82794dbf004781a86c8443b72263528167fe0359
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172316
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin 2024-08-23 14:17:01 +02:00
parent 1c4b613cda
commit 01d183d229
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editeng/source/items/frmitems.cxx
View file

@ -4255,6 +4255,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
ASSERT_CHANGE_REFCOUNTED_ITEM;
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId)
{
@ -4462,6 +4463,23 @@ bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const
return bEqual;
}
size_t SvxBrushItem::hashCode() const
{
std::size_t seed(0);
o3tl::hash_combine(seed, static_cast<sal_Int32>(aColor));
o3tl::hash_combine(seed, maComplexColor);
o3tl::hash_combine(seed, static_cast<sal_Int32>(aFilterColor));
o3tl::hash_combine(seed, eGraphicPos);
o3tl::hash_combine(seed, nGraphicTransparency);
if ( GPOS_NONE != eGraphicPos )
{
o3tl::hash_combine(seed, maStrLink);
o3tl::hash_combine(seed, maStrFilter);
}
o3tl::hash_combine(seed, nShadingValue);
return seed;
}
SvxBrushItem* SvxBrushItem::Clone( SfxItemPool* ) const
{
return new SvxBrushItem( *this );

2
include/editeng/brushitem.hxx
View file

@ -85,6 +85,8 @@ public:
OUString &rText, const IntlWrapper& ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool supportsHashCode() const override { return true; }
virtual size_t hashCode() const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;