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

OSL_ENSURE -> SAL_WARN_IF (silence -Werror=unused-macros)

Change-Id: I34cb3308916c95b95d3197d207c49a3799760163
üst 6a944422
...@@ -1547,17 +1547,13 @@ static void lcl_ResizeBox( const SwTableBox* pBox, sal_uInt16* pWidth ) ...@@ -1547,17 +1547,13 @@ static void lcl_ResizeBox( const SwTableBox* pBox, sal_uInt16* pWidth )
static void lcl_ResizeLine( const SwTableLine* pLine, sal_uInt16 *pWidth ) static void lcl_ResizeLine( const SwTableLine* pLine, sal_uInt16 *pWidth )
{ {
#if OSL_DEBUG_LEVEL > 0
sal_uInt16 nOldWidth = *pWidth; sal_uInt16 nOldWidth = *pWidth;
#endif
*pWidth = 0; *pWidth = 0;
BOOST_FOREACH( const SwTableBox* pBox, pLine->GetTabBoxes() ) BOOST_FOREACH( const SwTableBox* pBox, pLine->GetTabBoxes() )
lcl_ResizeBox(pBox, pWidth ); lcl_ResizeBox(pBox, pWidth );
#if OSL_DEBUG_LEVEL > 0 SAL_WARN_IF( nOldWidth && Abs(*pWidth-nOldWidth) >= COLFUZZY, "sw.core",
OSL_ENSURE( !nOldWidth || Abs(*pWidth-nOldWidth) < COLFUZZY, "A box's rows have all a different length" );
"A box's rows have all a different length." );
#endif
} }
void SwHTMLTableLayout::SetWidths( sal_Bool bCallPass2, sal_uInt16 nAbsAvail, void SwHTMLTableLayout::SetWidths( sal_Bool bCallPass2, sal_uInt16 nAbsAvail,
...@@ -1626,8 +1622,8 @@ void SwHTMLTableLayout::SetWidths( sal_Bool bCallPass2, sal_uInt16 nAbsAvail, ...@@ -1626,8 +1622,8 @@ void SwHTMLTableLayout::SetWidths( sal_Bool bCallPass2, sal_uInt16 nAbsAvail,
sal_uInt16 nCalcTabWidth = 0; sal_uInt16 nCalcTabWidth = 0;
BOOST_FOREACH( const SwTableLine *pLine, pSwTable->GetTabLines() ) BOOST_FOREACH( const SwTableLine *pLine, pSwTable->GetTabLines() )
lcl_ResizeLine( pLine, &nCalcTabWidth ); lcl_ResizeLine( pLine, &nCalcTabWidth );
OSL_ENSURE( Abs( nRelTabWidth-nCalcTabWidth ) < COLFUZZY, SAL_WARN_IF( Abs( nRelTabWidth-nCalcTabWidth ) >= COLFUZZY, "sw.core",
"Table width is not equal to the row width." ); "Table width is not equal to the row width" );
// Lock the table format when altering it, or else the box formats // Lock the table format when altering it, or else the box formats
// are altered again. // are altered again.
......
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