[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/qa lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/fail/reference-3.lwp |binary
 lotuswordpro/source/filter/lwptablelayout.cxx     |   17 ++++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit f538ff6272bf8f9264ebd5c8d97d712831f301d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun May 8 17:25:33 2016 +0100

    fftester: fail on double parse of the same table
    
    Change-Id: I3e462cdc8812d0ac55d9896d2b04ace34a6c4670
    (cherry picked from commit 4e509d80ee7b22ce0e79d62f7afb7a008726fe5f)
    Reviewed-on: https://gerrit.libreoffice.org/24773
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/lotuswordpro/qa/cppunit/data/fail/reference-3.lwp b/lotuswordpro/qa/cppunit/data/fail/reference-3.lwp
new file mode 100644
index 0000000..6076b43
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/reference-3.lwp differ
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 1bd119f..c643f3c 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -754,9 +754,8 @@ void LwpTableLayout::RegisterStyle()
     //         so the NULL pointer cause sodc freeze. Add code to check the
     //         the pointer.
     //New Code
-    if( GetFoundry() && GetTable() )
-
-    PutCellVals( GetFoundry(),GetTable()->GetObjectID() );
+    if (GetFoundry() && GetTable())
+        PutCellVals(GetFoundry(), GetTable()->GetObjectID());
 }
 /**
  * @short   read table layout
@@ -765,11 +764,15 @@ void LwpTableLayout::RegisterStyle()
 void LwpTableLayout::ParseTable()
 {
     // get super table layout
-    LwpSuperTableLayout * pSuper = GetSuperTableLayout();
-    if(!pSuper)
+    LwpSuperTableLayout* pSuper = GetSuperTableLayout();
+    if (!pSuper)
     {
-        assert(false);
-        return;
+        throw std::runtime_error("missing super table");
+    }
+
+    if (m_pXFTable.get())
+    {
+        throw std::runtime_error("this table is already parsed");
     }
 
     // set name of object