sw/source/core/doc/htmltbl.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cc949585d51f5fdbd1a4d5b29c38a03d0c637caa
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Dec 24 11:24:24 2017 +0000
ofz#4760 Floating-point-exception
Change-Id: I4f379e045d12e8eae3dd140cfd6eb958a3003d09
Reviewed-on: https://gerrit.libreoffice.org/47042
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
