commit f25eca3f230c170b46d7ce9f40842161a50b1883
author Caolán McNamara <caolanm@redhat.com> Sun Apr 03 21:35:26 2016 +0100
committer Miklos Vajna <vmiklos@collabora.co.uk> Mon Apr 04 08:20:00 2016 +0000
tree f69b7d90914c01e6fb3ffeb7e55d1e55b72cb752
parent 527f2cd0b75f901efc683efd92a51af771b860b5

subtable corruption is possible

Change-Id: Ifbf4312df583724a22328491bea3b6e05b82418f
(cherry picked from commit 9814cf713c57b211f5632733a853150d1d1e8da9)
Reviewed-on: https://gerrit.libreoffice.org/23767
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp

diff --git a/lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp b/lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp
new file mode 100644
index 0000000..3d906ee
--- /dev/null
+++ b/lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp
Binary files differ

lotuswordpro/source/filter/xfilter/xfcell.cxx

diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index 7dde717..523bb1a 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -89,10 +89,9 @@ void    XFCell::Add(XFContent *pContent)
        Reset();
        m_eValueType = enumXFValueTypeNone;
    }
    if( m_pSubTable )
    if (m_pSubTable)
    {
        assert(false);
        return;
        throw std::runtime_error("subtable already set");
    }
    if (!pContent)
    {