[Libreoffice-commits] .: sw/source

[Stephan Bergmann]

 sw/source/core/doc/tblrwcl.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit cdf783872af1df9389353803dc64ccab0c8f033e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 15 09:54:26 2012 +0200

    Work around signed/unsigned warning (old GCC versions), and adapt loop type
    
    Change-Id: I48a0c1b9f754381ae6dec546ab9443040df8210c

diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index cab9d92..b07088d 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3488,17 +3488,18 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
 
     SwTwips nAktSize = 0;
     // See if the tables have a correct width
-    for (sal_uInt16 n = 0; n < rBoxes.size(); ++n)
+    for (SwTableBoxes::const_iterator i(rBoxes.begin()); i != rBoxes.end(); ++i)
     {
-        const SwTableBox* pBox = rBoxes[ n ];
+        const SwTableBox* pBox = *i;
         const SwTwips nBoxW = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
         nAktSize += nBoxW;
 
-        for( sal_uInt16 i = 0; i < pBox->GetTabLines().Count(); ++i )
-            _CheckBoxWidth( *pBox->GetTabLines()[ i ], nBoxW );
+        for( sal_uInt16 j = 0; j < pBox->GetTabLines().Count(); ++j )
+            _CheckBoxWidth( *pBox->GetTabLines()[ j ], nBoxW );
     }
 
-    if (Abs(nAktSize - nSize) > (COLFUZZY * rBoxes.size()))
+    if (sal::static_int_cast< unsigned long >(Abs(nAktSize - nSize)) >
+        (COLFUZZY * rBoxes.size()))
     {
         OSL_FAIL( "Line's Boxes are too small or too large" );
     }