lotuswordpro/inc/xfilter/xfcontent.hxx | 3 ---
lotuswordpro/qa/cppunit/data/pass/tdf129993-2.lwp |binary
lotuswordpro/qa/cppunit/data/pass/tdf71147-1.lwp |binary
lotuswordpro/source/filter/lwptablelayout.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx | 3 ---
5 files changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 0453eb32b9055fe27fcb7b9cef22c46d32e59196
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jan 20 19:45:26 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jan 20 21:54:35 2020 +0100
Resolves: tdf#130093 some lwp file not loading
Change-Id: I2be53792f0fadcf1ca0e99c8f9fab7305d0fcddd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87100
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/lotuswordpro/inc/xfilter/xfcontent.hxx
b/lotuswordpro/inc/xfilter/xfcontent.hxx
index 8cb5be5da2c6..ca5bfc4a9da3 100644
--- a/lotuswordpro/inc/xfilter/xfcontent.hxx
+++ b/lotuswordpro/inc/xfilter/xfcontent.hxx
@@ -105,7 +105,6 @@ public:
protected:
XFContent()
: m_bDoingToXml(false)
- , m_bInserted(false)
{
}
@@ -116,8 +115,6 @@ protected:
OUString m_strStyleName;
private:
bool m_bDoingToXml;
-public:
- bool m_bInserted;
};
#endif
diff --git a/lotuswordpro/qa/cppunit/data/pass/tdf129993-2.lwp
b/lotuswordpro/qa/cppunit/data/pass/tdf129993-2.lwp
new file mode 100644
index 000000000000..0f0645e3ba77
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/pass/tdf129993-2.lwp
differ
diff --git a/lotuswordpro/qa/cppunit/data/pass/tdf71147-1.lwp
b/lotuswordpro/qa/cppunit/data/pass/tdf71147-1.lwp
new file mode 100644
index 000000000000..fc351f434dde
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/pass/tdf71147-1.lwp
differ
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index a49c4375858b..e1647dd34511 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -834,7 +834,7 @@ void LwpTableLayout::Read()
void LwpTableLayout::XFConvert(XFContentContainer* pCont)
{
if (!m_pXFTable)
- throw std::runtime_error("missing table");
+ return;
pCont->Add(m_pXFTable.get());
}
/**
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
index c8e8de733027..b64ad72721a4 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
@@ -70,9 +70,6 @@ XFContentContainer::~XFContentContainer()
void XFContentContainer::Add(XFContent *pContent)
{
- if (pContent->m_bInserted)
- throw std::runtime_error("already inserted");
- pContent->m_bInserted = true;
m_aContents.emplace_back(pContent);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
