summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-10-03 13:45:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-10-03 13:45:14 +0100
commitdfd0284a533ecb2ead683368062f35ff5288de42 (patch)
tree15df9210cea4910f53915b1b54a42c364afece2f /sw/source
parenta8526ce7ead7738ff4ad981c31ca1a4c5b51e5f6 (diff)
CID#1078699 confusing indent
and drop BOOST_FOREACH cause I that's a horror IMO Change-Id: Ic62e297443c2d02e43f3960088fd63612d7c63f0
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/frmedt/tblsel.cxx17
1 files changed, 13 insertions, 4 deletions
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 48c252028b76..8ee074900c4f 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -1480,12 +1480,21 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes )
pFndBox = 0;
}
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 )
- 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);
+ }
+ }
if( !bMergeSelOk )
eRet = TBLMERGE_TOOCOMPLEX;
}