mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svx: prefix members of SvxBitmapListItem

Browse Source 
And the same in a couple of more related classes, so we can still have a
single version of the QUERY_PUT_IMPL() macro.

See tdf#94879 for motivation.

Change-Id: I48e9132cef4983b25bafb8c03f595f7855d60e61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183252
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna 2025-03-24 08:09:14 +01:00
parent b936f80d96
commit f16c450ace
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/svx/drawitem.hxx
View File

@ -25,7 +25,7 @@
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxColorListItem final : public SfxPoolItem
{
XColorListRef pColorList;
XColorListRef m_pColorList;
public:
static SfxPoolItem* CreateDefault();
@ -46,12 +46,12 @@ public:
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;
const XColorListRef& GetColorList() const { return pColorList; }
const XColorListRef& GetColorList() const { return m_pColorList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxGradientListItem final : public SfxPoolItem
{
XGradientListRef pGradientList;
XGradientListRef m_pGradientList;
public:
static SfxPoolItem* CreateDefault();
@ -72,12 +72,12 @@ public:
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;
const XGradientListRef& GetGradientList() const { return pGradientList; }
const XGradientListRef& GetGradientList() const { return m_pGradientList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxHatchListItem final : public SfxPoolItem
{
XHatchListRef pHatchList;
XHatchListRef m_pHatchList;
public:
static SfxPoolItem* CreateDefault();
@ -97,12 +97,12 @@ public:
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;
const XHatchListRef& GetHatchList() const { return pHatchList; }
const XHatchListRef& GetHatchList() const { return m_pHatchList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxBitmapListItem final : public SfxPoolItem
{
XBitmapListRef pBitmapList;
XBitmapListRef m_pBitmapList;
public:
static SfxPoolItem* CreateDefault();
@ -123,12 +123,12 @@ public:
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;
const XBitmapListRef& GetBitmapList() const { return pBitmapList; }
const XBitmapListRef& GetBitmapList() const { return m_pBitmapList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxPatternListItem final : public SfxPoolItem
{
XPatternListRef pPatternList;
XPatternListRef m_pPatternList;
public:
static SfxPoolItem* CreateDefault();
@ -148,12 +148,12 @@ public:
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;
const XPatternListRef& GetPatternList() const { return pPatternList; }
const XPatternListRef& GetPatternList() const { return m_pPatternList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDashListItem final : public SfxPoolItem
{
XDashListRef pDashList;
XDashListRef m_pDashList;
public:
static SfxPoolItem* CreateDefault();
@ -174,12 +174,12 @@ public:
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;
const XDashListRef& GetDashList() const { return pDashList; }
const XDashListRef& GetDashList() const { return m_pDashList; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxLineEndListItem final : public SfxPoolItem
{
XLineEndListRef pLineEndList;
XLineEndListRef m_pLineEndList;
public:
static SfxPoolItem* CreateDefault();
@ -200,7 +200,7 @@ public:
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;
const XLineEndListRef& GetLineEndList() const { return pLineEndList; }
const XLineEndListRef& GetLineEndList() const { return m_pLineEndList; }
};
#endif

46
svx/source/items/drawitem.cxx
View File

@ -40,14 +40,14 @@ SvxColorListItem::SvxColorListItem()
SvxColorListItem::SvxColorListItem( XColorListRef pTable, TypedWhichId<SvxColorListItem> nW ) :
SfxPoolItem( nW ),
pColorList(std::move( pTable ))
m_pColorList(std::move( pTable ))
{
}
SvxColorListItem::SvxColorListItem( const SvxColorListItem& rItem ) :
SfxPoolItem( rItem ),
pColorList( rItem.pColorList )
m_pColorList( rItem.m_pColorList )
{
}
@ -66,7 +66,7 @@ bool SvxColorListItem::GetPresentation
bool SvxColorListItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
return static_cast<const SvxColorListItem&>(rItem).pColorList == pColorList;
return static_cast<const SvxColorListItem&>(rItem).m_pColorList == m_pColorList;
}
SvxColorListItem* SvxColorListItem::Clone( SfxItemPool * ) const
@ -78,7 +78,7 @@ SvxColorListItem* SvxColorListItem::Clone( SfxItemPool * ) const
#define QUERY_PUT_IMPL(svtype, xtype) \
bool svtype::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const \
{ \
rVal <<= uno::Reference< uno::XWeak >( p##xtype ); \
rVal <<= uno::Reference< uno::XWeak >( m_p##xtype ); \
return true; \
} \
\
@ -86,7 +86,7 @@ bool svtype::PutValue( const css::uno::Any& rVal, sal_uInt8 ) \
{ \
uno::Reference< uno::XWeak > xRef; \
if( rVal >>= xRef ) { \
p##xtype = X##xtype##Ref(dynamic_cast<X##xtype *>(xRef.get())); \
m_p##xtype = X##xtype##Ref(dynamic_cast<X##xtype *>(xRef.get())); \
return true; \
} \
return false; \
@ -101,14 +101,14 @@ SvxGradientListItem::SvxGradientListItem()
SvxGradientListItem::SvxGradientListItem( XGradientListRef pList, TypedWhichId<SvxGradientListItem> nW ) :
SfxPoolItem( nW ),
pGradientList(std::move( pList ))
m_pGradientList(std::move( pList ))
{
}
SvxGradientListItem::SvxGradientListItem( const SvxGradientListItem& rItem ) :
SfxPoolItem( rItem ),
pGradientList( rItem.pGradientList )
m_pGradientList( rItem.m_pGradientList )
{
}
@ -129,7 +129,7 @@ bool SvxGradientListItem::GetPresentation
bool SvxGradientListItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
return static_cast<const SvxGradientListItem&>(rItem).pGradientList == pGradientList;
return static_cast<const SvxGradientListItem&>(rItem).m_pGradientList == m_pGradientList;
}
SvxGradientListItem* SvxGradientListItem::Clone( SfxItemPool * ) const
@ -147,14 +147,14 @@ SvxHatchListItem::SvxHatchListItem()
SvxHatchListItem::SvxHatchListItem( XHatchListRef pList, TypedWhichId<SvxHatchListItem> nW ) :
SfxPoolItem( nW ),
pHatchList(std::move( pList ))
m_pHatchList(std::move( pList ))
{
}
SvxHatchListItem::SvxHatchListItem( const SvxHatchListItem& rItem ) :
SfxPoolItem( rItem ),
pHatchList( rItem.pHatchList )
m_pHatchList( rItem.m_pHatchList )
{
}
@ -175,7 +175,7 @@ bool SvxHatchListItem::GetPresentation
bool SvxHatchListItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
return static_cast<const SvxHatchListItem&>(rItem).pHatchList == pHatchList;
return static_cast<const SvxHatchListItem&>(rItem).m_pHatchList == m_pHatchList;
}
SvxHatchListItem* SvxHatchListItem::Clone( SfxItemPool * ) const
@ -192,13 +192,13 @@ SvxBitmapListItem::SvxBitmapListItem()
SvxBitmapListItem::SvxBitmapListItem( XBitmapListRef pList, TypedWhichId<SvxBitmapListItem> nW ) :
SfxPoolItem( nW ),
pBitmapList(std::move( pList ))
m_pBitmapList(std::move( pList ))
{
}
SvxBitmapListItem::SvxBitmapListItem( const SvxBitmapListItem& rItem ) :
SfxPoolItem( rItem ),
pBitmapList( rItem.pBitmapList )
m_pBitmapList( rItem.m_pBitmapList )
{
}
@ -217,7 +217,7 @@ bool SvxBitmapListItem::GetPresentation
bool SvxBitmapListItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
return static_cast<const SvxBitmapListItem&>(rItem).pBitmapList == pBitmapList;
return static_cast<const SvxBitmapListItem&>(rItem).m_pBitmapList == m_pBitmapList;
}
SvxBitmapListItem* SvxBitmapListItem::Clone( SfxItemPool * ) const
@ -234,13 +234,13 @@ SvxPatternListItem::SvxPatternListItem()
SvxPatternListItem::SvxPatternListItem( XPatternListRef pList, TypedWhichId<SvxPatternListItem> nW ) :
SfxPoolItem( nW ),
pPatternList(std::move( pList ))
m_pPatternList(std::move( pList ))
{
}
SvxPatternListItem::SvxPatternListItem( const SvxPatternListItem& rItem ) :
SfxPoolItem( rItem ),
pPatternList( rItem.pPatternList )
m_pPatternList( rItem.m_pPatternList )
{
}
@ -259,7 +259,7 @@ bool SvxPatternListItem::GetPresentation
bool SvxPatternListItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
return static_cast<const SvxPatternListItem&>(rItem).pPatternList == pPatternList;
return static_cast<const SvxPatternListItem&>(rItem).m_pPatternList == m_pPatternList;
}
SvxPatternListItem* SvxPatternListItem::Clone( SfxItemPool * ) const
@ -276,13 +276,13 @@ SvxDashListItem::SvxDashListItem()
SvxDashListItem::SvxDashListItem( XDashListRef pList, TypedWhichId<SvxDashListItem> nW ) :
SfxPoolItem( nW ),
pDashList(std::move( pList ))
m_pDashList(std::move( pList ))
{
}
SvxDashListItem::SvxDashListItem( const SvxDashListItem& rItem ) :
SfxPoolItem( rItem ),
pDashList( rItem.pDashList )
m_pDashList( rItem.m_pDashList )
{
}
@ -301,7 +301,7 @@ bool SvxDashListItem::GetPresentation
bool SvxDashListItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
return static_cast<const SvxDashListItem&>(rItem).pDashList == pDashList;
return static_cast<const SvxDashListItem&>(rItem).m_pDashList == m_pDashList;
}
SvxDashListItem* SvxDashListItem::Clone( SfxItemPool * ) const
@ -318,13 +318,13 @@ SvxLineEndListItem::SvxLineEndListItem()
SvxLineEndListItem::SvxLineEndListItem( XLineEndListRef pList, TypedWhichId<SvxLineEndListItem> nW ) :
SfxPoolItem( nW ),
pLineEndList(std::move( pList ))
m_pLineEndList(std::move( pList ))
{
}
SvxLineEndListItem::SvxLineEndListItem( const SvxLineEndListItem& rItem ) :
SfxPoolItem( rItem ),
pLineEndList( rItem.pLineEndList )
m_pLineEndList( rItem.m_pLineEndList )
{
}
@ -343,7 +343,7 @@ bool SvxLineEndListItem::GetPresentation
bool SvxLineEndListItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
return static_cast<const SvxLineEndListItem&>(rItem).pLineEndList == pLineEndList;
return static_cast<const SvxLineEndListItem&>(rItem).m_pLineEndList == m_pLineEndList;
}
SvxLineEndListItem* SvxLineEndListItem::Clone( SfxItemPool * ) const