summaryrefslogtreecommitdiff
path: root/sw/source/core/doc/htmltbl.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-12-29 14:45:57 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-12-29 14:46:22 +0000
commita24cfdf7646e827beb34bdcad99f59956ef8d582 (patch)
treed6807db2afd96ffe1d1cea7722ecd6d6a0a677a6 /sw/source/core/doc/htmltbl.cxx
parent1f349bb10c3c1fc6d5d598847a7281cef728b762 (diff)
ofz#4829 Floating-point-exception
Change-Id: Ifadeff08fe0c7d88498c8c657ce3955f0a518ef9
Diffstat (limited to 'sw/source/core/doc/htmltbl.cxx')
-rw-r--r--sw/source/core/doc/htmltbl.cxx7
1 files changed, 6 insertions, 1 deletions
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<m_nCols; i++ )
{
SwHTMLTableLayoutColumn *pColumn = GetColumn( i );