[Libreoffice-commits] core.git: lotuswordpro/source

[Noel Grandin (via logerrit)]

 lotuswordpro/source/filter/lwpcelllayout.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 39fa33d01032ad3f5cdc164aee654022d30775b5
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Mar 13 16:44:24 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Mar 25 14:36:42 2020 +0100

    fix assert when loading id:000059,sig:11,src:000008,op:havoc,rep:2.lwp
    
    one of caolans test files, which appears to have a row layout which
    references a non-existent parent.
    
    Change-Id: I9322ed430aa9edd47db9967a19938b02e4af6bc7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90475
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 17f516a7897a..13b6461feeb5 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -713,10 +713,7 @@ void LwpConnectedCellLayout::SetCellMap()
 LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout)
 {
     if (!pTableLayout)
-    {
-        assert(false);
-        return enumWholeBorder;
-    }
+        throw std::runtime_error("missing table layout");
 
     sal_uInt16 nRowSpan = m_nRealrowspan;