| commit | 0453eb32b9055fe27fcb7b9cef22c46d32e59196 | [log] |
|---|---|---|
| author | Caolán McNamara <caolanm@redhat.com> | Mon Jan 20 19:45:26 2020 +0000 |
| committer | Caolán McNamara <caolanm@redhat.com> | Mon Jan 20 21:54:35 2020 +0100 |
| tree | 55f0a38801f5af4aa07981d158a28f27aaee058c | |
| parent | c4934d2affbc272f97cbae3eb15bfcc5af57a1da [diff] |
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 <caolanm@redhat.com>
diff --git a/lotuswordpro/inc/xfilter/xfcontent.hxx b/lotuswordpro/inc/xfilter/xfcontent.hxx index 8cb5be5..ca5bfc4 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 0000000..0f0645e --- /dev/null +++ b/lotuswordpro/qa/cppunit/data/pass/tdf129993-2.lwp Binary files 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 0000000..fc351f4 --- /dev/null +++ b/lotuswordpro/qa/cppunit/data/pass/tdf71147-1.lwp Binary files differ
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index a49c437..e1647dd 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 c8e8de7..b64ad72 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); }