[Libreoffice-commits] core.git: lotuswordpro/source
Caolán McNamara
caolanm at redhat.com
Tue Dec 22 12:10:59 PST 2015
lotuswordpro/source/filter/lwpfribtable.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 8a05b74eeb8d5e0955fbe3cefd945cdc9bffa3f5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 22 20:09:17 2015 +0000
guard against missing ContentContainer
Change-Id: I4f2c5d53148deb02d990edc42140c23f02409cea
diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx b/lotuswordpro/source/filter/lwpfribtable.cxx
index e76c25d..d14ea31 100644
--- a/lotuswordpro/source/filter/lwpfribtable.cxx
+++ b/lotuswordpro/source/filter/lwpfribtable.cxx
@@ -111,7 +111,7 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont)
pXFContentContainer = m_pPara->GetXFContainer();
//delete the additional blank para
XFParagraph* pCurrPara = m_pPara->GetFribs().GetXFPara();
- if(!pCurrPara->HasContents())
+ if (pXFContentContainer && !pCurrPara->HasContents())
{
if(pXFContentContainer->GetLastContent() == pCurrPara)
{
@@ -142,18 +142,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);
More information about the Libreoffice-commits
mailing list