diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-29 08:37:03 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-29 08:38:38 +0100 |
commit | dbcc527e14f5c45694dac3e6751b00b89be9bd58 (patch) | |
tree | b5ae8f35f6b27f6aa4dde3adb1d5e3df88583988 | |
parent | e754ed9d8c4535464d9003dcedc43cde6b0fd7b8 (diff) |
sw: prefix members of SwNumFormat
Change-Id: I71c2004b411831ce869331ab7251683f78428b2b
-rw-r--r-- | sw/inc/numrule.hxx | 8 | ||||
-rw-r--r-- | sw/source/core/doc/number.cxx | 22 |
2 files changed, 15 insertions, 15 deletions
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 8ad9031e2b61..5c35820479a1 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -49,9 +49,9 @@ const sal_Unicode cBulletChar = 0x2022; ///< Character for lists. class SW_DLLPUBLIC SwNumFormat : public SvxNumberFormat, public SwClient { - SwFormatVertOrient* pVertOrient; + SwFormatVertOrient* m_pVertOrient; //For i120928,record the cp info of graphic within bullet - sal_Unicode cGrfBulletCP; + sal_Unicode m_cGrfBulletCP; SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc ); using SvxNumberFormat::operator ==; @@ -79,8 +79,8 @@ public: virtual OUString GetCharFormatName() const override; //For i120928,access the cp info of graphic within bullet - void SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;} - sal_Unicode GetGrfBulletCP() const {return cGrfBulletCP;} + void SetGrfBulletCP(sal_Unicode cP){m_cGrfBulletCP = cP;} + sal_Unicode GetGrfBulletCP() const {return m_cGrfBulletCP;} virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0) override; diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 4688d21daa94..d1a2a2f39fe1 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -178,16 +178,16 @@ static void lcl_SetRuleChgd( SwTextNode& rNd, sal_uInt8 nLevel ) SwNumFormat::SwNumFormat() : SvxNumberFormat(SVX_NUM_ARABIC), SwClient( 0 ), - pVertOrient(new SwFormatVertOrient( 0, text::VertOrientation::NONE)) - ,cGrfBulletCP(USHRT_MAX)//For i120928,record the cp info of graphic within bullet + m_pVertOrient(new SwFormatVertOrient( 0, text::VertOrientation::NONE)) + ,m_cGrfBulletCP(USHRT_MAX)//For i120928,record the cp info of graphic within bullet { } SwNumFormat::SwNumFormat( const SwNumFormat& rFormat) : SvxNumberFormat(rFormat), SwClient( rFormat.GetRegisteredInNonConst() ), - pVertOrient(new SwFormatVertOrient( 0, rFormat.GetVertOrient())) - ,cGrfBulletCP(rFormat.cGrfBulletCP)//For i120928,record the cp info of graphic within bullet + m_pVertOrient(new SwFormatVertOrient( 0, rFormat.GetVertOrient())) + ,m_cGrfBulletCP(rFormat.m_cGrfBulletCP)//For i120928,record the cp info of graphic within bullet { sal_Int16 eMyVertOrient = rFormat.GetVertOrient(); SetGraphicBrush( rFormat.GetBrush(), &rFormat.GetGraphicSize(), @@ -196,8 +196,8 @@ SwNumFormat::SwNumFormat( const SwNumFormat& rFormat) : SwNumFormat::SwNumFormat(const SvxNumberFormat& rNumFormat, SwDoc* pDoc) : SvxNumberFormat(rNumFormat) - , pVertOrient(new SwFormatVertOrient( 0, rNumFormat.GetVertOrient())) - , cGrfBulletCP(USHRT_MAX) + , m_pVertOrient(new SwFormatVertOrient( 0, rNumFormat.GetVertOrient())) + , m_cGrfBulletCP(USHRT_MAX) { sal_Int16 eMyVertOrient = rNumFormat.GetVertOrient(); SetGraphicBrush( rNumFormat.GetBrush(), &rNumFormat.GetGraphicSize(), @@ -222,7 +222,7 @@ SwNumFormat::SwNumFormat(const SvxNumberFormat& rNumFormat, SwDoc* pDoc) SwNumFormat::~SwNumFormat() { - delete pVertOrient; + delete m_pVertOrient; } // #i22362# @@ -262,7 +262,7 @@ SwNumFormat& SwNumFormat::operator=( const SwNumFormat& rNumFormat) else if( GetRegisteredIn() ) GetRegisteredInNonConst()->Remove( this ); //For i120928,record the cp info of graphic within bullet - cGrfBulletCP = rNumFormat.cGrfBulletCP; + m_cGrfBulletCP = rNumFormat.m_cGrfBulletCP; return *this; } @@ -318,7 +318,7 @@ void SwNumFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size const sal_Int16* pOrient) { if(pOrient) - pVertOrient->SetVertOrient( *pOrient ); + m_pVertOrient->SetVertOrient( *pOrient ); SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient); } @@ -365,8 +365,8 @@ const SwFormatVertOrient* SwNumFormat::GetGraphicOrientation() const return 0; else { - pVertOrient->SetVertOrient(eOrient); - return pVertOrient; + m_pVertOrient->SetVertOrient(eOrient); + return m_pVertOrient; } } |