From a24cfdf7646e827beb34bdcad99f59956ef8d582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 29 Dec 2017 14:45:57 +0000 Subject: [PATCH] ofz#4829 Floating-point-exception Change-Id: Ifadeff08fe0c7d88498c8c657ce3955f0a518ef9 --- sw/source/core/doc/htmltbl.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index d329824725de..d3cbdbcaf564 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -964,10 +964,15 @@ void SwHTMLTableLayout::AutoLayoutPass1() // width of the affected columns. // For the maximum widths we also take the fixed-width columns // into account. Is that correct? + sal_uLong nFixMax = 0; 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_uLong nFixMax = m_nMax - nRelMax; for( i=0; i