mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftester: fail on double parse of the same table

Browse Source 
Change-Id: I3e462cdc8812d0ac55d9896d2b04ace34a6c4670
This commit is contained in:
Caolán McNamara
2016-05-08 17:25:33 +01:00
parent ace0b3bdec
commit 4e509d80ee
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lotuswordpro/qa/cppunit/data/fail/reference-3.lwp Normal file
View File

Binary file not shown.

17
lotuswordpro/source/filter/lwptablelayout.cxx
View File

@@ -754,9 +754,8 @@ void LwpTableLayout::RegisterStyle()
// so the NULL pointer cause sodc freeze. Add code to check the // so the NULL pointer cause sodc freeze. Add code to check the
// the pointer. // the pointer.
//New Code //New Code
if( GetFoundry() && GetTable() ) if (GetFoundry() && GetTable())
PutCellVals(GetFoundry(), GetTable()->GetObjectID());
PutCellVals( GetFoundry(),GetTable()->GetObjectID() );
} }
/** /**
* @short read table layout * @short read table layout
@@ -765,11 +764,15 @@ void LwpTableLayout::RegisterStyle()
void LwpTableLayout::ParseTable() void LwpTableLayout::ParseTable()
{ {
// get super table layout // get super table layout
LwpSuperTableLayout * pSuper = GetSuperTableLayout(); LwpSuperTableLayout* pSuper = GetSuperTableLayout();
if(!pSuper) if (!pSuper)
{ {
assert(false); throw std::runtime_error("missing super table");
return; }
if (m_pXFTable.get())
{
throw std::runtime_error("this table is already parsed");
} }
// set name of object // set name of object