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

svx: prefix members of XFillGradientItem

Browse source 
See tdf#94879 for motivation.

Change-Id: I3d951d553d524cedc876330a70e6fe94edba0173
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163579
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna 2024-02-19 08:00:48 +01:00
parent 3ba92b5f1e
commit e3c0aeec83
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/svx/xflgrit.hxx
View file

@ -30,7 +30,7 @@ class SdrModel;
class SVXCORE_DLLPUBLIC XFillGradientItem : public NameOrIndex
{
basegfx::BGradient aGradient;
basegfx::BGradient m_aGradient;
public:
static SfxPoolItem* CreateDefault();
@ -50,7 +50,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
const basegfx::BGradient& GetGradientValue() const; // GetValue -> GetGradientValue
void SetGradientValue(const basegfx::BGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue
void SetGradientValue(const basegfx::BGradient& rNew) { m_aGradient = rNew; Detach(); } // SetValue -> SetGradientValue
static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
std::unique_ptr<XFillGradientItem> checkForUniqueItem( SdrModel* pModel ) const;

16
svx/source/xoutdev/xattr.cxx
View file

@ -2212,26 +2212,26 @@ SfxPoolItem* XFillGradientItem::CreateDefault() { return new XFillGradientItem;
XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
const basegfx::BGradient& rTheGradient) :
NameOrIndex(XATTR_FILLGRADIENT, nIndex),
aGradient(rTheGradient)
m_aGradient(rTheGradient)
{
}
XFillGradientItem::XFillGradientItem(const OUString& rName,
const basegfx::BGradient& rTheGradient, TypedWhichId<XFillGradientItem> nWhich)
: NameOrIndex(nWhich, rName)
, aGradient(rTheGradient)
, m_aGradient(rTheGradient)
{
}
XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) :
NameOrIndex(rItem),
aGradient(rItem.aGradient)
m_aGradient(rItem.m_aGradient)
{
}
XFillGradientItem::XFillGradientItem( const basegfx::BGradient& rTheGradient )
: NameOrIndex( XATTR_FILLGRADIENT, -1 ),
aGradient(rTheGradient)
m_aGradient(rTheGradient)
{
}
@ -2243,16 +2243,16 @@ XFillGradientItem* XFillGradientItem::Clone(SfxItemPool* /*pPool*/) const
bool XFillGradientItem::operator==(const SfxPoolItem& rItem) const
{
return ( NameOrIndex::operator==(rItem) &&
aGradient == static_cast<const XFillGradientItem&>(rItem).aGradient );
m_aGradient == static_cast<const XFillGradientItem&>(rItem).m_aGradient );
}
const basegfx::BGradient& XFillGradientItem::GetGradientValue() const // GetValue -> GetGradientValue
{
if (!IsIndex())
return aGradient;
return m_aGradient;
// ToDo: This should fail. We never called this code with a table so this should always
// have failed. Thus, I'm thinking that XFillGradientItem can't be an Index.
return aGradient;
return m_aGradient;
}
bool XFillGradientItem::GetPresentation
@ -2485,7 +2485,7 @@ std::unique_ptr<XFillGradientItem> XFillGradientItem::checkForUniqueItem( SdrMod
// if the given name is not valid, replace it!
if( aUniqueName != GetName() )
return std::make_unique<XFillGradientItem>( aUniqueName, aGradient, TypedWhichId<XFillGradientItem>(Which()) );
return std::make_unique<XFillGradientItem>( aUniqueName, m_aGradient, TypedWhichId<XFillGradientItem>(Which()) );
}
return nullptr;