diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-05-12 11:11:27 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-05-12 11:16:40 +0200 |
| commit | fe036ea3fa0cd594e65f99d9c2ff07c8623e5f5e (patch) | |
| tree | 0c94cb1093c25dd9829fe92df92fce51c1a3781e | |
| parent | 6a298f0ef5e2de59cf42decd01cb25230c960f75 (diff) | |
sw: Prefix LinesAndTable member variables.
Change-Id: Ic5c8e439de38a421e2ac056fc1c11c872cee34f7
| -rw-r--r-- | sw/source/core/docnode/ndtbl1.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index fe857d4f538a..341132376990 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -164,12 +164,12 @@ static bool lcl_IsAnLower( const SwTableLine *pLine, const SwTableLine *pAssumed struct LinesAndTable { - std::vector<SwTableLine*> &rLines; - const SwTable &rTable; - bool bInsertLines; + std::vector<SwTableLine*> &m_rLines; + const SwTable &m_rTable; + bool m_bInsertLines; - LinesAndTable( std::vector<SwTableLine*> &rL, const SwTable &rTbl ) : - rLines( rL ), rTable( rTbl ), bInsertLines( true ) {} + LinesAndTable(std::vector<SwTableLine*> &rL, const SwTable &rTbl) : + m_rLines(rL), m_rTable(rTbl), m_bInsertLines(true) {} }; bool _FindLine( _FndLine & rLine, LinesAndTable* pPara ); @@ -178,27 +178,27 @@ bool _FindBox( _FndBox & rBox, LinesAndTable* pPara ) { if (!rBox.GetLines().empty()) { - pPara->bInsertLines = true; - for( _FndLine & rFndLine : rBox.GetLines() ) - _FindLine( rFndLine, pPara ); - if ( pPara->bInsertLines ) + pPara->m_bInsertLines = true; + for (_FndLine & rFndLine : rBox.GetLines()) + _FindLine(rFndLine, pPara); + + if (pPara->m_bInsertLines) { const SwTableLines &rLines = (rBox.GetBox()) ? rBox.GetBox()->GetTabLines() - : pPara->rTable.GetTabLines(); + : pPara->m_rTable.GetTabLines(); if (rBox.GetLines().size() == rLines.size()) { for ( auto pLine : rLines ) - ::InsertLine( pPara->rLines, pLine ); + ::InsertLine(pPara->m_rLines, pLine); } else - pPara->bInsertLines = false; + pPara->m_bInsertLines = false; } } else if (rBox.GetBox()) { - ::InsertLine( pPara->rLines, - static_cast<SwTableLine*>(rBox.GetBox()->GetUpper())); + ::InsertLine(pPara->m_rLines, static_cast<SwTableLine*>(rBox.GetBox()->GetUpper())); } return true; } |