diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-28 07:58:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-28 07:58:27 +0100 |
| commit | 0f60c1a50a98683e44325114e4cc19b355c87f49 (patch) | |
| tree | bb72c4dea7139f8306955b61f7558eff604a7445 /sw/source | |
| parent | 6a944422c42a27ce9dc6fd2432c18f3743ac088f (diff) | |
OSL_ENSURE -> SAL_WARN_IF (silence -Werror=unused-macros)
Change-Id: I34cb3308916c95b95d3197d207c49a3799760163
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/doc/htmltbl.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 5f1a759f4ea7..6260ec317f90 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -1547,17 +1547,13 @@ static void lcl_ResizeBox( const SwTableBox* pBox, sal_uInt16* pWidth ) static void lcl_ResizeLine( const SwTableLine* pLine, sal_uInt16 *pWidth ) { -#if OSL_DEBUG_LEVEL > 0 sal_uInt16 nOldWidth = *pWidth; -#endif *pWidth = 0; BOOST_FOREACH( const SwTableBox* pBox, pLine->GetTabBoxes() ) lcl_ResizeBox(pBox, pWidth ); -#if OSL_DEBUG_LEVEL > 0 - OSL_ENSURE( !nOldWidth || Abs(*pWidth-nOldWidth) < COLFUZZY, - "A box's rows have all a different length." ); -#endif + SAL_WARN_IF( nOldWidth && Abs(*pWidth-nOldWidth) >= COLFUZZY, "sw.core", + "A box's rows have all a different length" ); } 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; BOOST_FOREACH( const SwTableLine *pLine, pSwTable->GetTabLines() ) lcl_ResizeLine( pLine, &nCalcTabWidth ); - OSL_ENSURE( Abs( nRelTabWidth-nCalcTabWidth ) < COLFUZZY, - "Table width is not equal to the row width." ); + SAL_WARN_IF( Abs( nRelTabWidth-nCalcTabWidth ) >= COLFUZZY, "sw.core", + "Table width is not equal to the row width" ); // Lock the table format when altering it, or else the box formats // are altered again. |