summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-12-24 11:24:24 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-12-25 21:52:11 +0100
commitcc949585d51f5fdbd1a4d5b29c38a03d0c637caa (patch)
tree6a7dd3ab3a2ae383d89a8610e51d6a2b95b8b48f /sw/source
parent052cec29a66bb69a17c94bd86de7a2dcd7c79689 (diff)
ofz#4760 Floating-point-exception
Change-Id: I4f379e045d12e8eae3dd140cfd6eb958a3003d09 Reviewed-on: https://gerrit.libreoffice.org/47042 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/htmltbl.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index a234f7bfbf13..55aa8a096495 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -1016,11 +1016,11 @@ void SwHTMLTableLayout::AutoLayoutPass1()
pColumn->SetMax( pColumn->GetMin() );
}
// and divide by the quotient
- OSL_ENSURE( nQuotMax!=ULONG_MAX, "Where did the relative columns go?" );
- for( i=0; i<m_nCols; i++ )
+ SAL_WARN_IF(nQuotMax != ULONG_MAX && !nQuotMax, "sw.core", "Where did the relative columns go?");
+ for (i = 0; i < m_nCols; ++i)
{
SwHTMLTableLayoutColumn *pColumn = GetColumn( i );
- if( pColumn->IsRelWidthOption() && pColumn->GetWidthOption() )
+ if (pColumn->IsRelWidthOption() && pColumn->GetWidthOption() && nQuotMax)
{
if( pColumn->GetWidthOption() )
{