diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-10-08 10:50:23 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-08 10:51:43 +0100 |
| commit | cc1273543f4084a779a2b0400c22466672557a95 (patch) | |
| tree | e7897931c0d415175f43970b0ef70da1ee755d19 /lotuswordpro/source | |
| parent | a42f582e0e8ee4118415632795184620c6b8058c (diff) | |
Resolves: tdf#93818 crash on loading certain lwp
Change-Id: I11f523a0936b843155f3b47139d0fc58d4d0342b
Diffstat (limited to 'lotuswordpro/source')
| -rw-r--r-- | lotuswordpro/source/filter/lwpfrib.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index 7d5bbb5947d1..c6c31601ca13 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -245,10 +245,14 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) XFTextStyle* pStyle = NULL; m_StyleName.clear(); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); + XFTextStyle* pNamedStyle = nullptr; if (m_pModifiers->HasCharStyle) { - XFTextStyle* pNamedStyle = static_cast<XFTextStyle*> + pNamedStyle = static_cast<XFTextStyle*> (pFoundry->GetStyleManager()->GetStyle(m_pModifiers->CharStyleID)); + } + if (pNamedStyle) + { if (m_pModifiers->FontID) { pStyle = new XFTextStyle(); |