summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-23 15:33:36 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-12-23 15:33:59 +0000
commit330127baf96c417e0eeaef9808d124788b547cf3 (patch)
treed04296ea9b598fd9fb907e92ac060ca954f4c8d1
parentc694c1812280e03fc04c77fb6483a2410097eb37 (diff)
guard against missing DropcapMgr and Foundry
Change-Id: I1007d4fac2514bc165941c70109cd8e3d57153cd
-rw-r--r--lotuswordpro/source/filter/lwpfribptr.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index 2d62f23036e2..af7b520a3ddc 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -282,10 +282,15 @@ void LwpFribPtr::XFConvert()
LwpFribFrame* frameFrib= static_cast<LwpFribFrame*>(pFrib);
rtl::Reference<LwpObject> pLayout = frameFrib->GetLayout();
if (pLayout.is() && pLayout->GetTag() == VO_DROPCAPLAYOUT)
- m_pPara->GetFoundry()->GetDropcapMgr()->SetXFPara(m_pXFPara);
+ {
+ LwpFoundry* pFoundry = m_pPara->GetFoundry();
+ LwpDropcapMgr* pMgr = pFoundry ? pFoundry->GetDropcapMgr() : nullptr;
+ if (pMgr)
+ pMgr->SetXFPara(m_pXFPara);
+ }
frameFrib->XFConvert(m_pXFPara);
- }
break;
+ }
case FRIB_TAG_CHBLOCK:
{
LwpFribCHBlock* chbFrib = static_cast<LwpFribCHBlock*>(pFrib);