diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-02-12 22:02:55 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-02-13 00:25:05 +0100 |
commit | c0970c2be45ea62d86e24271065311aaa92c0186 (patch) | |
tree | 458ca46eae3e8fdd3324000b2ef59d65aee3f2cb | |
parent | cd24d2524f2c2da51f982015f1b027003b192808 (diff) |
fdo#41712: rename members to track down assignments
-rw-r--r-- | sw/source/core/inc/flowfrm.hxx | 23 | ||||
-rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 15 | ||||
-rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/frmform.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/xmldump.cxx | 12 |
5 files changed, 29 insertions, 27 deletions
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx index 65d8e47ed19a..25a7502ea7a3 100644 --- a/sw/source/core/inc/flowfrm.hxx +++ b/sw/source/core/inc/flowfrm.hxx @@ -114,8 +114,8 @@ class SwFlowFrm protected: - SwFlowFrm *pFollow; - SwFlowFrm *pPrecede; + SwFlowFrm *m_pFollow; + SwFlowFrm *m_pPrecede; sal_Bool bIsFollow :1; //Ist's ein Follow sal_Bool bLockJoin :1; //Join (und damit deleten) verboten wenn sal_True! @@ -161,16 +161,16 @@ public: //neuen Parent Moven. void MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling = 0 ); - sal_Bool HasFollow() const { return pFollow ? sal_True : sal_False; } + sal_Bool HasFollow() const { return m_pFollow ? sal_True : sal_False; } sal_Bool IsFollow() const { return bIsFollow; } inline void _SetIsFollow( sal_Bool bSet ) { bIsFollow = bSet; } - const SwFlowFrm *GetFollow() const { return pFollow; } - SwFlowFrm *GetFollow() { return pFollow; } + const SwFlowFrm *GetFollow() const { return m_pFollow; } + SwFlowFrm *GetFollow() { return m_pFollow; } sal_Bool IsAnFollow( const SwFlowFrm *pFlow ) const; - inline void SetFollow( SwFlowFrm *pNew ); + void SetFollow(SwFlowFrm *const pFollow); - const SwFlowFrm *GetPrecede() const { return pPrecede; } - SwFlowFrm *GetPrecede() { return pPrecede; } + const SwFlowFrm *GetPrecede() const { return m_pPrecede; } + SwFlowFrm *GetPrecede() { return m_pPrecede; } sal_Bool IsJoinLocked() const { return bLockJoin; } @@ -239,13 +239,6 @@ inline sal_Bool SwFlowFrm::IsFwdMoveAllowed() return rThis.GetIndPrev() != 0; } -inline void SwFlowFrm::SetFollow( SwFlowFrm *pNew ) -{ - pFollow = pNew; - if ( pFollow != NULL ) - pFollow->pPrecede = this; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 31c79b00185e..24f1b518e912 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -79,8 +79,8 @@ sal_Bool SwFlowFrm::bMoveBwdJump = sal_False; SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) : rThis( rFrm ), - pFollow( 0 ), - pPrecede( 0 ), + m_pFollow( 0 ), + m_pPrecede( 0 ), bIsFollow( false ), bLockJoin( false ), bUndersized( false ), @@ -88,6 +88,15 @@ SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) : {} +void SwFlowFrm::SetFollow(SwFlowFrm *const pFollow) +{ + m_pFollow = pFollow; + if (m_pFollow != NULL) + { + m_pFollow->m_pPrecede = this; + } +} + /************************************************************************* |* |* SwFlowFrm::IsFollowLocked() @@ -214,7 +223,7 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK { SwFrm *pNxt; if( 0 != (pNxt = rThis.FindNextCnt()) && - (!pFollow || pNxt != pFollow->GetFrm())) + (!m_pFollow || pNxt != m_pFollow->GetFrm())) { // #135914# // The last row of a table only keeps with the next content diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 6a0e3d943d5c..581c1239732f 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -222,7 +222,7 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove ) } else if( HasFollow() ) GetFollow()->bIsFollow = sal_False; - pFollow = NULL; + m_pFollow = NULL; if( pUp ) { Frm().Height( 0 ); diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 1d7c15e6ce4b..1b3418725d37 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -681,7 +681,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm() } pFoll->Cut(); delete pFoll; - pFollow = pNxt; + m_pFollow = pNxt; return pNxt; } @@ -2065,7 +2065,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat ) return sal_False; } - if( pFollow && nStart != ((SwTxtFrm*)pFollow)->GetOfst() ) + if (m_pFollow && nStart != (static_cast<SwTxtFrm*>(m_pFollow))->GetOfst()) return sal_False; // kann z.B. durch Orphans auftreten (35083,35081) // Geschafft, wir sind durch ... diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 83419bd949f7..25e83475d1ba 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -366,8 +366,8 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) if ( HasFollow() ) xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%p", GetFollow() ); - if ( pPrecede != NULL ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwTxtFrm*)pPrecede ); + if (m_pPrecede != NULL) + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwTxtFrm*)m_pPrecede ); } void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) @@ -376,8 +376,8 @@ void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) if ( HasFollow() ) xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%p", GetFollow() ); - if ( pPrecede != NULL ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwSectionFrm*)pPrecede ); + if (m_pPrecede != NULL) + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwSectionFrm*)m_pPrecede ); } void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) @@ -386,8 +386,8 @@ void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) if ( HasFollow() ) xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%p", GetFollow() ); - if ( pPrecede != NULL ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwTabFrm*)pPrecede ); + if (m_pPrecede != NULL) + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwTabFrm*)m_pPrecede ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |