diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-22 20:09:17 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-01-04 12:20:39 +0100 |
| commit | 9b2abf2d84b37050f47484e515f26902b4ac88d4 (patch) | |
| tree | 1dcfe1466a32f531d1d30c655c74348925b7aef5 /lotuswordpro | |
| parent | b6f2b0ad2dfd49aa58ebfbd9576ca5eb1b10e279 (diff) | |
guard against missing ContentContainer
Change-Id: I4f2c5d53148deb02d990edc42140c23f02409cea
(cherry picked from commit 8a05b74eeb8d5e0955fbe3cefd945cdc9bffa3f5)
(cherry picked from commit e439aebde0f60e7fe9bb19e96964eb3d26e50e3c)
Reviewed-on: https://gerrit.libreoffice.org/20884
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 3968eec7145d20b398a196bf72ce51f16cebae9e)
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/source/filter/lwpfribtable.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx b/lotuswordpro/source/filter/lwpfribtable.cxx index 606659243f26..9b69ac7be752 100644 --- a/lotuswordpro/source/filter/lwpfribtable.cxx +++ b/lotuswordpro/source/filter/lwpfribtable.cxx @@ -112,7 +112,7 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont) pXFContentContainer = m_pPara->GetXFContainer(); //delete the additional blank para, 06/28/2005 XFParagraph* pCurrPara = m_pPara->GetFribs().GetXFPara(); - if(!pCurrPara->HasContents()) + if (pXFContentContainer && !pCurrPara->HasContents()) { if(pXFContentContainer->GetLastContent() == pCurrPara) { @@ -144,18 +144,20 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont) LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance(); LwpChangeMgr* pChangeMgr = pGlobal->GetLwpChangeMgr(); sChangeID = pChangeMgr->GetChangeID(this); - if (!sChangeID.isEmpty()) + if (!sChangeID.isEmpty() && pXFContentContainer) { XFChangeStart* pChangeStart = new XFChangeStart; pChangeStart->SetChangeID(sChangeID); pXFContentContainer->Add(pChangeStart); } } - pSuper->XFConvert(pXFContentContainer); + + if (pXFContentContainer) + pSuper->XFConvert(pXFContentContainer); if(m_bRevisionFlag) { - if (!sChangeID.isEmpty()) + if (!sChangeID.isEmpty() && pXFContentContainer) { XFChangeEnd* pChangeEnd = new XFChangeEnd; pChangeEnd->SetChangeID(sChangeID); |