ofz#4829 Floating-point-exception

Change-Id: Ifadeff08fe0c7d88498c8c657ce3955f0a518ef9
This commit is contained in:
Caolán McNamara
2017-12-29 14:45:57 +00:00
parent 1f349bb10c
commit a24cfdf764

View File

@@ -964,10 +964,15 @@ void SwHTMLTableLayout::AutoLayoutPass1()
// width of the affected columns. // width of the affected columns.
// For the maximum widths we also take the fixed-width columns // For the maximum widths we also take the fixed-width columns
// into account. Is that correct? // into account. Is that correct?
sal_uLong nFixMax = 0;
if( nRel < 100 && nRelCols < m_nCols ) if( nRel < 100 && nRelCols < m_nCols )
{
nFixMax = m_nMax - nRelMax;
SAL_WARN_IF(!nFixMax, "sw.core", "bad fixed width max");
}
if (nFixMax)
{ {
sal_uInt16 nRelLeft = 100 - nRel; sal_uInt16 nRelLeft = 100 - nRel;
sal_uLong nFixMax = m_nMax - nRelMax;
for( i=0; i<m_nCols; i++ ) for( i=0; i<m_nCols; i++ )
{ {
SwHTMLTableLayoutColumn *pColumn = GetColumn( i ); SwHTMLTableLayoutColumn *pColumn = GetColumn( i );