Kaydet (Commit) dfd0284a authored tarafından Caolán McNamara's avatar Caolán McNamara

CID#1078699 confusing indent

and drop BOOST_FOREACH cause I that's a horror IMO

Change-Id: Ic62e297443c2d02e43f3960088fd63612d7c63f0
üst a8526ce7
...@@ -1480,12 +1480,21 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes ) ...@@ -1480,12 +1480,21 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes )
pFndBox = 0; pFndBox = 0;
} }
if( pFndBox ) if( pFndBox )
BOOST_FOREACH( _FndLine& rFndLine, pFndBox->GetLines() ) {
lcl_CheckRow( rFndLine, &bMergeSelOk ); for (_FndLines::const_iterator it = pFndBox->GetLines().begin(),
end = pFndBox->GetLines().end(); it != end; ++it)
{
lcl_CheckRow(*it, &bMergeSelOk);
}
}
else if( pFndLine ) else if( pFndLine )
for (_FndBoxes::const_iterator it = pFndLine->GetBoxes().begin(); {
it != pFndLine->GetBoxes().end(); ++it) for (_FndBoxes::const_iterator it = pFndLine->GetBoxes().begin(),
end = pFndLine->GetBoxes().end(); it != end; ++it)
{
lcl_CheckCol(*it, &bMergeSelOk); lcl_CheckCol(*it, &bMergeSelOk);
}
}
if( !bMergeSelOk ) if( !bMergeSelOk )
eRet = TBLMERGE_TOOCOMPLEX; eRet = TBLMERGE_TOOCOMPLEX;
} }
......
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