include/svx/rulritem.hxx | 20 +++++------ svx/source/dialog/rulritem.cxx | 72 ++++++++++++++++++++--------------------- 2 files changed, 46 insertions(+), 46 deletions(-)
New commits: commit c3df5eb7b4b445e4201683e48acd3fc14c2113ab Author: Miklos Vajna <[email protected]> AuthorDate: Mon Jan 19 08:16:29 2026 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Jan 19 09:27:09 2026 +0100 svx: prefix members of SvxColumnItem See tdf#94879 for motivation. Change-Id: I90923d835b75050b41276c7c95151ecaa0c54717 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197544 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 626fa5d17a9b..44009c456be0 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -148,14 +148,14 @@ inline std::basic_ostream<charT, traits> & operator <<( class SVX_DLLPUBLIC SvxColumnItem final : public SfxPoolItem { - std::vector<SvxColumnDescription> aColumns; // Column array + std::vector<SvxColumnDescription> m_aColumns; // Column array - tools::Long nLeft; // Left edge for the table - tools::Long nRight; // Right edge for the table; for columns always + tools::Long m_nLeft; // Left edge for the table + tools::Long m_nRight; // Right edge for the table; for columns always // equal to the surrounding frame - sal_uInt16 nActColumn; // the current column - bool bTable; // table? - bool bOrtho; // evenly spread columns + sal_uInt16 m_nActColumn; // the current column + bool m_bTable; // table? + bool m_bOrtho; // evenly spread columns virtual bool operator==( const SfxPoolItem& ) const override; @@ -186,12 +186,12 @@ public: void Append(const SvxColumnDescription& rDesc); void SetLeft(tools::Long aLeft); void SetRight(tools::Long aRight); - sal_uInt16 GetActColumn() const { return nActColumn;} + sal_uInt16 GetActColumn() const { return m_nActColumn;} bool IsFirstAct() const; bool IsLastAct() const; - tools::Long GetLeft() const { return nLeft;} - tools::Long GetRight() const { return nRight;} - bool IsTable() const { return bTable;} + tools::Long GetLeft() const { return m_nLeft;} + tools::Long GetRight() const { return m_nRight;} + bool IsTable() const { return m_bTable;} bool CalcOrtho() const; void SetOrtho(bool bVal); bool IsConsistent() const; diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 6a4e09e16021..99e8a29ec81e 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -387,10 +387,10 @@ SvxPagePosSizeItem::SvxPagePosSizeItem() : bool SvxColumnItem::operator==(const SfxPoolItem& rCmp) const { if(!SfxPoolItem::operator==(rCmp) || - nActColumn != static_cast<const SvxColumnItem&>(rCmp).nActColumn || - nLeft != static_cast<const SvxColumnItem&>(rCmp).nLeft || - nRight != static_cast<const SvxColumnItem&>(rCmp).nRight || - bTable != static_cast<const SvxColumnItem&>(rCmp).bTable || + m_nActColumn != static_cast<const SvxColumnItem&>(rCmp).m_nActColumn || + m_nLeft != static_cast<const SvxColumnItem&>(rCmp).m_nLeft || + m_nRight != static_cast<const SvxColumnItem&>(rCmp).m_nRight || + m_bTable != static_cast<const SvxColumnItem&>(rCmp).m_bTable || Count() != static_cast<const SvxColumnItem&>(rCmp).Count()) return false; @@ -405,21 +405,21 @@ bool SvxColumnItem::operator==(const SfxPoolItem& rCmp) const SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) : SfxPoolItem (SID_RULER_BORDERS ), - nLeft (0), - nRight (0), - nActColumn (nAct), - bTable (false), - bOrtho (true) + m_nLeft (0), + m_nRight (0), + m_nActColumn (nAct), + m_bTable (false), + m_bOrtho (true) {} SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 right ) : SfxPoolItem (SID_RULER_BORDERS), - nLeft (left), - nRight (right), - nActColumn (nActCol), - bTable (true), - bOrtho (true) + m_nLeft (left), + m_nRight (right), + m_nActColumn (nActCol), + m_bTable (true), + m_bOrtho (true) {} bool SvxColumnItem::GetPresentation( @@ -465,19 +465,19 @@ bool SvxColumnItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const case MID_COLUMNARRAY: return false; case MID_RIGHT: - rVal <<= nRight; + rVal <<= m_nRight; break; case MID_LEFT: - rVal <<= nLeft; + rVal <<= m_nLeft; break; case MID_ORTHO: - rVal <<= bOrtho; + rVal <<= m_bOrtho; break; case MID_ACTUAL: - rVal <<= static_cast<sal_Int32>(nActColumn); + rVal <<= static_cast<sal_Int32>(m_nActColumn); break; case MID_TABLE: - rVal <<= bTable; + rVal <<= m_bTable; break; default: SAL_WARN("svx", "Wrong MemberId!"); @@ -498,22 +498,22 @@ bool SvxColumnItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) return false; } case MID_RIGHT: - rVal >>= nRight; + rVal >>= m_nRight; break; case MID_LEFT: - rVal >>= nLeft; + rVal >>= m_nLeft; break; case MID_ORTHO: rVal >>= nVal; - bOrtho = static_cast<bool>(nVal); + m_bOrtho = static_cast<bool>(nVal); break; case MID_ACTUAL: rVal >>= nVal; - nActColumn = static_cast<sal_uInt16>(nVal); + m_nActColumn = static_cast<sal_uInt16>(nVal); break; case MID_TABLE: rVal >>= nVal; - bTable = static_cast<bool>(nVal); + m_bTable = static_cast<bool>(nVal); break; default: OSL_FAIL("Wrong MemberId!"); @@ -525,53 +525,53 @@ bool SvxColumnItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) sal_uInt16 SvxColumnItem::Count() const { - return aColumns.size(); + return m_aColumns.size(); } SvxColumnDescription& SvxColumnItem::At(sal_uInt16 index) { - return aColumns[index]; + return m_aColumns[index]; } SvxColumnDescription& SvxColumnItem::GetActiveColumnDescription() { - return aColumns[GetActColumn()]; + return m_aColumns[GetActColumn()]; } SvxColumnDescription& SvxColumnItem::operator[](sal_uInt16 index) { - return aColumns[index]; + return m_aColumns[index]; } const SvxColumnDescription& SvxColumnItem::operator[](sal_uInt16 index) const { - return aColumns[index]; + return m_aColumns[index]; } void SvxColumnItem::Append(const SvxColumnDescription &rDesc) { - aColumns.push_back(rDesc); + m_aColumns.push_back(rDesc); } void SvxColumnItem::SetLeft(tools::Long left) { - nLeft = left; + m_nLeft = left; } void SvxColumnItem::SetRight(tools::Long right) { - nRight = right; + m_nRight = right; } bool SvxColumnItem::IsFirstAct() const { - return nActColumn == 0; + return m_nActColumn == 0; } bool SvxColumnItem::IsLastAct() const { - return nActColumn == Count() - 1; + return m_nActColumn == Count() - 1; } SvxColumnDescription::SvxColumnDescription(tools::Long start, tools::Long end, bool bVis) : @@ -613,12 +613,12 @@ tools::Long SvxColumnDescription::GetWidth() const /* SvxColumnItem */ void SvxColumnItem::SetOrtho(bool bVal) { - bOrtho = bVal; + m_bOrtho = bVal; } bool SvxColumnItem::IsConsistent() const { - return nActColumn < aColumns.size(); + return m_nActColumn < m_aColumns.size(); } bool SvxObjectItem::operator==( const SfxPoolItem& rCmp ) const
