Kaydet (Commit) cdf78387 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Work around signed/unsigned warning (old GCC versions), and adapt loop type

Change-Id: I48a0c1b9f754381ae6dec546ab9443040df8210c
üst 50cb1667
...@@ -3488,17 +3488,18 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ) ...@@ -3488,17 +3488,18 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
SwTwips nAktSize = 0; SwTwips nAktSize = 0;
// See if the tables have a correct width // 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(); const SwTwips nBoxW = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
nAktSize += nBoxW; nAktSize += nBoxW;
for( sal_uInt16 i = 0; i < pBox->GetTabLines().Count(); ++i ) for( sal_uInt16 j = 0; j < pBox->GetTabLines().Count(); ++j )
_CheckBoxWidth( *pBox->GetTabLines()[ i ], nBoxW ); _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" ); OSL_FAIL( "Line's Boxes are too small or too large" );
} }
......
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