diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-23 15:33:36 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-01-04 12:20:40 +0100 |
| commit | f8887d73444afe1a61beb24e3d4469f99159afbe (patch) | |
| tree | 71f0d3e7f50d4b184c60402735eacd48121f40a8 /lotuswordpro/source | |
| parent | 9b2abf2d84b37050f47484e515f26902b4ac88d4 (diff) | |
guard against missing DropcapMgr and Foundry
Change-Id: I1007d4fac2514bc165941c70109cd8e3d57153cd
(cherry picked from commit 330127baf96c417e0eeaef9808d124788b547cf3)
(cherry picked from commit e616ff7e29ee10d0c3ea2dc6a8fc135b87b572b7)
Reviewed-on: https://gerrit.libreoffice.org/20910
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit ec066b44392f8ed1015540220b6b4620facd873e)
Diffstat (limited to 'lotuswordpro/source')
| -rw-r--r-- | lotuswordpro/source/filter/lwpfribptr.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index 79486a2d474c..e69b50832818 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -288,10 +288,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); |