[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/frmedt/tblsel.cxx |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit dfd0284a533ecb2ead683368062f35ff5288de42
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Oct 3 13:45:10 2013 +0100

    CID#1078699 confusing indent
    
    and drop BOOST_FOREACH cause I that's a horror IMO
    
    Change-Id: Ic62e297443c2d02e43f3960088fd63612d7c63f0

diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 48c2520..8ee0749 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;
         }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits