diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-27 08:40:30 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-27 08:43:26 +0100 |
commit | d0a09f854e054bf3b7df312190780db8e1873ef0 (patch) | |
tree | 218a461431c46341b6a108030a86aa0f43f77916 /sw | |
parent | cd15605876bb0bfa8921a8c1779feed49189d165 (diff) |
sw: prefix members of SwTableNode
Change-Id: Ibbcafef60e5074ef8b9e86bd6709bcfa50a5068d
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/node.hxx | 6 | ||||
-rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index e24ae4b2521e..9d070245f79d 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -494,15 +494,15 @@ private: class SW_DLLPUBLIC SwTableNode : public SwStartNode, public SwModify { friend class SwNodes; - SwTable* pTable; + SwTable* m_pTable; protected: virtual ~SwTableNode(); public: SwTableNode( const SwNodeIndex & ); - const SwTable& GetTable() const { return *pTable; } - SwTable& GetTable() { return *pTable; } + const SwTable& GetTable() const { return *m_pTable; } + SwTable& GetTable() { return *m_pTable; } SwTabFrm *MakeFrm( SwFrm* ); /// Creates the frms for the table node (i.e. the TabFrms). diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 5500e124de1d..68aa2f4c4de3 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1597,7 +1597,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh, // "Delete" the Table and merge all Lines/Boxes _DelTabPara aDelPara( *this, cCh, pUndo ); - for( SwTableLine *pLine : pTableNd->pTable->GetTabLines() ) + for( SwTableLine *pLine : pTableNd->m_pTable->GetTabLines() ) lcl_DelLine( pLine, &aDelPara ); // We just created a TextNode with fitting separator for every TableLine. @@ -1609,7 +1609,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh, // first Text Node { // What about UNDO? - const SfxItemSet& rTableSet = pTableNd->pTable->GetFrameFormat()->GetAttrSet(); + const SfxItemSet& rTableSet = pTableNd->m_pTable->GetFrameFormat()->GetAttrSet(); const SfxPoolItem *pBreak, *pDesc; if( SfxItemState::SET != rTableSet.GetItemState( RES_PAGEDESC, false, &pDesc )) pDesc = 0; @@ -2342,7 +2342,7 @@ sal_uInt16 SwDoc::MergeTable( SwPaM& rPam ) SwTableNode::SwTableNode( const SwNodeIndex& rIdx ) : SwStartNode( rIdx, ND_TABLENODE ) { - pTable = new SwTable( 0 ); + m_pTable = new SwTable( 0 ); } SwTableNode::~SwTableNode() @@ -2353,12 +2353,12 @@ SwTableNode::~SwTableNode() pTableFormat ); pTableFormat->ModifyNotification( &aMsgHint, &aMsgHint ); DelFrms(); - delete pTable; + delete m_pTable; } SwTabFrm *SwTableNode::MakeFrm( SwFrm* pSib ) { - return new SwTabFrm( *pTable, pSib ); + return new SwTabFrm( *m_pTable, pSib ); } /** @@ -2435,7 +2435,7 @@ void SwTableNode::DelFrms() The TabFrms are attached to the FrameFormat of the SwTable. We need to delete them in a more cumbersome way, for the Master to also delete the Follows. */ - SwIterator<SwTabFrm,SwFormat> aIter( *(pTable->GetFrameFormat()) ); + SwIterator<SwTabFrm,SwFormat> aIter( *(m_pTable->GetFrameFormat()) ); SwTabFrm *pFrm = aIter.First(); while ( pFrm ) { @@ -2472,8 +2472,8 @@ void SwTableNode::DelFrms() void SwTableNode::SetNewTable( SwTable* pNewTable, bool bNewFrames ) { DelFrms(); - delete pTable; - pTable = pNewTable; + delete m_pTable; + m_pTable = pNewTable; if( bNewFrames ) { SwNodeIndex aIdx( *EndOfSectionNode()); |