diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-10-08 10:50:23 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-09 11:59:45 +0000 |
| commit | 425ee54728ae290ef9e51e63fa79432e6250486a (patch) | |
| tree | f6be51ad135cea3ae22bb1ddd1c1a435d50343e2 /lotuswordpro | |
| parent | 70f5afe3707c155b412e05e9750c38d00b56d345 (diff) | |
Resolves: tdf#93818 crash on loading certain lwp
Change-Id: I11f523a0936b843155f3b47139d0fc58d4d0342b
(cherry picked from commit cc1273543f4084a779a2b0400c22466672557a95)
Reviewed-on: https://gerrit.libreoffice.org/19242
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'lotuswordpro')
| -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 f93066082438..d88ec390a26b 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -249,10 +249,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(); |