sw/inc/cellatr.hxx | 6 +++--- sw/source/core/attr/cellatr.cxx | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit be94475414c878d1e3228da577b496985a4a6a8c Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon Mar 27 09:11:05 2017 +0200 sw: prefix members of SwTableBoxValue Change-Id: Id28b9d552083212f730d03725646c5b511462a26 Reviewed-on: https://gerrit.libreoffice.org/35743 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 36e709af2778..2dfb8c193b87 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -75,7 +75,7 @@ public: class SW_DLLPUBLIC SwTableBoxValue : public SfxPoolItem { - double nValue; + double m_nValue; public: SwTableBoxValue(); SwTableBoxValue( const double aVal ); @@ -86,11 +86,11 @@ public: SwTableBoxValue& operator=( const SwTableBoxValue& rCmp ) { - nValue = rCmp.nValue; + m_nValue = rCmp.m_nValue; return *this; } - double GetValue() const { return nValue; } + double GetValue() const { return m_nValue; } }; inline const SwTableBoxNumFormat &SwAttrSet::GetTableBoxNumFormat(bool bInP) const diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index 6817eea0c6c1..a157927a6089 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -193,12 +193,12 @@ void SwTableBoxFormula::Calc( SwTableCalcPara& rCalcPara, double& rValue ) } SwTableBoxValue::SwTableBoxValue() - : SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 ) + : SfxPoolItem( RES_BOXATR_VALUE ), m_nValue( 0 ) { } SwTableBoxValue::SwTableBoxValue( const double nVal ) - : SfxPoolItem( RES_BOXATR_VALUE ), nValue( nVal ) + : SfxPoolItem( RES_BOXATR_VALUE ), m_nValue( nVal ) { } @@ -207,14 +207,14 @@ bool SwTableBoxValue::operator==( const SfxPoolItem& rAttr ) const assert(SfxPoolItem::operator==(rAttr)); SwTableBoxValue const& rOther( static_cast<SwTableBoxValue const&>(rAttr) ); // items with NaN should be equal to enable pooling - return ::rtl::math::isNan( nValue ) - ? ::rtl::math::isNan( rOther.nValue ) - : ( nValue == rOther.nValue ); + return ::rtl::math::isNan( m_nValue ) + ? ::rtl::math::isNan( rOther.m_nValue ) + : ( m_nValue == rOther.m_nValue ); } SfxPoolItem* SwTableBoxValue::Clone( SfxItemPool* ) const { - return new SwTableBoxValue( nValue ); + return new SwTableBoxValue( m_nValue ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits