Skip to content

C
core
Kaydet (Commit) 89e72ed9 authored tarafından Matteo Casalin's avatar Matteo Casalin
Dosyalara gözat
Seçenekler

Reduce scope and improve readability 

Change-Id: I4bf1e2c0f928644e6f85acd75b88685303c4ac06
üst ac0aeeaa
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
sw/source/core/doc/tblcpy.cxx
Dosyayı görüntüle @ 89e72ed9
...@@ -815,7 +815,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes, ...@@ -815,7 +815,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc ); SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc );
SwTableBox *pTmpBox, *pSttBox = (SwTableBox*)rSelBoxes[0]; SwTableBox *pSttBox = (SwTableBox*)rSelBoxes[0];
_FndLine *pFLine, *pInsFLine = 0; _FndLine *pFLine, *pInsFLine = 0;
_FndBox aFndBox( 0, 0 ); _FndBox aFndBox( 0, 0 );
...@@ -872,8 +872,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes, ...@@ -872,8 +872,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
// Test for nesting // Test for nesting
for( SwTableBoxes::size_type nBx = 0; nBx < pCpyLn->GetTabBoxes().size(); ++nBx ) for( SwTableBoxes::size_type nBx = 0; nBx < pCpyLn->GetTabBoxes().size(); ++nBx )
if( !( pTmpBox = pLastLn->GetTabBoxes()[ nSttBox + nBx ]) if( !pLastLn->GetTabBoxes()[ nSttBox + nBx ]->GetSttNd() )
->GetSttNd() )
return false; return false;
} }
// We have enough space for the to-be-copied, so insert new // We have enough space for the to-be-copied, so insert new
...@@ -929,8 +928,8 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes, ...@@ -929,8 +928,8 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
// Test for nesting // Test for nesting
for( _FndBoxes::size_type nBx = 0; nBx < pFLine->GetBoxes().size(); ++nBx ) for( _FndBoxes::size_type nBx = 0; nBx < pFLine->GetBoxes().size(); ++nBx )
{ {
if( !( pTmpBox = pLine->GetTabBoxes()[ nSttBox + nBx ]) SwTableBox *pTmpBox = pLine->GetTabBoxes()[ nSttBox + nBx ];
->GetSttNd() ) if( !pTmpBox->GetSttNd() )
{ {
delete pInsFLine; delete pInsFLine;
return false; return false;
...@@ -951,8 +950,8 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes, ...@@ -951,8 +950,8 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
// Test for nesting // Test for nesting
for( SwTableBoxes::size_type nBx = 0; nBx < pCpyLn->GetTabBoxes().size(); ++nBx ) for( SwTableBoxes::size_type nBx = 0; nBx < pCpyLn->GetTabBoxes().size(); ++nBx )
{ {
if( !( pTmpBox = pLine->GetTabBoxes()[ nSttBox + nBx ]) SwTableBox *pTmpBox = pLine->GetTabBoxes()[ nSttBox + nBx ];
->GetSttNd() ) if( !pTmpBox->GetSttNd() )
return false; return false;
// if Ok, insert the Box into the FndLine // if Ok, insert the Box into the FndLine
if( nBx == pFLine->GetBoxes().size() ) if( nBx == pFLine->GetBoxes().size() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment