include/svx/pageitem.hxx | 22 ++++++++-------- svx/source/items/pageitem.cxx | 56 +++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 39 deletions(-)
New commits: commit 6c6d0bae27999a1b44872ee2b2a2c93c315f8d34 Author: Miklos Vajna <[email protected]> AuthorDate: Fri Jan 2 08:34:33 2026 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Jan 2 17:06:19 2026 +0100 svx: prefix members of SvxPageItem See tdf#94879 for motivation. Change-Id: I268131e6eabf686dece757d3457c0bb5e514ad31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196409 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index b7ec34cf70b3..801c24474445 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -50,10 +50,10 @@ portrait or landscape, layout) class SVX_DLLPUBLIC SvxPageItem final : public SfxPoolItem { private: - OUString aDescName; // name of the template - SvxNumType eNumType; - bool bLandscape; // Portrait / Landscape - SvxPageUsage eUse; // Layout + OUString m_aDescName; // name of the template + SvxNumType m_eNumType; + bool m_bLandscape; // Portrait / Landscape + SvxPageUsage m_eUse; // Layout public: @@ -76,18 +76,18 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; // orientation - SvxPageUsage GetPageUsage() const { return eUse; } - void SetPageUsage(SvxPageUsage eU) { eUse= eU; } + SvxPageUsage GetPageUsage() const { return m_eUse; } + void SetPageUsage(SvxPageUsage eU) { m_eUse= eU; } - bool IsLandscape() const { return bLandscape; } - void SetLandscape(bool bL) { bLandscape = bL; } + bool IsLandscape() const { return m_bLandscape; } + void SetLandscape(bool bL) { m_bLandscape = bL; } // enumeration - SvxNumType GetNumType() const { return eNumType; } - void SetNumType(SvxNumType eNum) { eNumType = eNum; } + SvxNumType GetNumType() const { return m_eNumType; } + void SetNumType(SvxNumType eNum) { m_eNumType = eNum; } // name of the descriptor - void SetDescName(const OUString& rStr) { aDescName = rStr; } + void SetDescName(const OUString& rStr) { m_aDescName = rStr; } }; diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index f3b322e248d4..27b83f6f7f2d 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -43,9 +43,9 @@ SfxPoolItem* SvxPageItem::CreateDefault() { return new SvxPageItem(TypedWhichId< SvxPageItem::SvxPageItem( const TypedWhichId<SvxPageItem> nId ) : SfxPoolItem( nId ), - eNumType ( SVX_NUM_ARABIC ), - bLandscape ( false ), - eUse ( SvxPageUsage::All ) + m_eNumType ( SVX_NUM_ARABIC ), + m_bLandscape ( false ), + m_eUse ( SvxPageUsage::All ) { } @@ -53,9 +53,9 @@ SvxPageItem::SvxPageItem( const TypedWhichId<SvxPageItem> nId ) SvxPageItem::SvxPageItem( const SvxPageItem& rItem ) : SfxPoolItem( rItem ) { - eNumType = rItem.eNumType; - bLandscape = rItem.bLandscape; - eUse = rItem.eUse; + m_eNumType = rItem.m_eNumType; + m_bLandscape = rItem.m_bLandscape; + m_eUse = rItem.m_eUse; } SvxPageItem::~SvxPageItem() {} @@ -71,9 +71,9 @@ bool SvxPageItem::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); const SvxPageItem& rItem = static_cast<const SvxPageItem&>(rAttr); - return ( eNumType == rItem.eNumType && - bLandscape == rItem.bLandscape && - eUse == rItem.eUse ); + return ( m_eNumType == rItem.m_eNumType && + m_bLandscape == rItem.m_bLandscape && + m_eUse == rItem.m_eUse ); } static OUString GetUsageText( const SvxPageUsage eU ) @@ -133,16 +133,16 @@ bool SvxPageItem::GetPresentation { case SfxItemPresentation::Nameless: { - if ( !aDescName.isEmpty() ) + if ( !m_aDescName.isEmpty() ) { - rText = aDescName + cpDelimTmp; + rText = m_aDescName + cpDelimTmp; } - rText += GetNumberingDescription(eNumType) + cpDelimTmp; - if ( bLandscape ) + rText += GetNumberingDescription(m_eNumType) + cpDelimTmp; + if ( m_bLandscape ) rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE); else rText += SvxResId(RID_SVXITEMS_PAGE_LAND_FALSE); - OUString aUsageText = GetUsageText( eUse ); + OUString aUsageText = GetUsageText( m_eUse ); if (!aUsageText.isEmpty()) { rText += cpDelimTmp + aUsageText; @@ -152,16 +152,16 @@ bool SvxPageItem::GetPresentation case SfxItemPresentation::Complete: { rText += SvxResId(RID_SVXITEMS_PAGE_COMPLETE); - if ( !aDescName.isEmpty() ) + if ( !m_aDescName.isEmpty() ) { - rText += aDescName + cpDelimTmp; + rText += m_aDescName + cpDelimTmp; } - rText += GetNumberingDescription(eNumType) + cpDelimTmp; - if ( bLandscape ) + rText += GetNumberingDescription(m_eNumType) + cpDelimTmp; + if ( m_bLandscape ) rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE); else rText += SvxResId(RID_SVXITEMS_PAGE_LAND_FALSE); - OUString aUsageText = GetUsageText( eUse ); + OUString aUsageText = GetUsageText( m_eUse ); if (!aUsageText.isEmpty()) { rText += cpDelimTmp + aUsageText; @@ -183,16 +183,16 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case MID_PAGE_NUMTYPE: { //! constants aren't in IDLs any more ?!? - rVal <<= static_cast<sal_Int16>( eNumType ); + rVal <<= static_cast<sal_Int16>( m_eNumType ); } break; case MID_PAGE_ORIENTATION: - rVal <<= bLandscape; + rVal <<= m_bLandscape; break; case MID_PAGE_LAYOUT : { style::PageStyleLayout eRet; - switch(eUse) + switch(m_eUse) { case SvxPageUsage::Left : eRet = style::PageStyleLayout_LEFT; break; case SvxPageUsage::Right : eRet = style::PageStyleLayout_RIGHT; break; @@ -220,11 +220,11 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if(!(rVal >>= nValue)) return false; - eNumType = static_cast<SvxNumType>(nValue); + m_eNumType = static_cast<SvxNumType>(nValue); } break; case MID_PAGE_ORIENTATION: - bLandscape = Any2Bool(rVal); + m_bLandscape = Any2Bool(rVal); break; case MID_PAGE_LAYOUT : { @@ -238,10 +238,10 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } switch( eLayout ) { - case style::PageStyleLayout_LEFT : eUse = SvxPageUsage::Left ; break; - case style::PageStyleLayout_RIGHT : eUse = SvxPageUsage::Right; break; - case style::PageStyleLayout_ALL : eUse = SvxPageUsage::All ; break; - case style::PageStyleLayout_MIRRORED: eUse = SvxPageUsage::Mirror;break; + case style::PageStyleLayout_LEFT : m_eUse = SvxPageUsage::Left ; break; + case style::PageStyleLayout_RIGHT : m_eUse = SvxPageUsage::Right; break; + case style::PageStyleLayout_ALL : m_eUse = SvxPageUsage::All ; break; + case style::PageStyleLayout_MIRRORED: m_eUse = SvxPageUsage::Mirror;break; default: ;//prevent warning } }
