diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-17 10:52:13 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-12-21 13:16:16 +0100 |
| commit | d2a48f8b5b9f3adc2330cf3a9544d9db0916e550 (patch) | |
| tree | 57499df4989b03b2c3bd6d9e10a74fa49e6ef6cf /lotuswordpro | |
| parent | 1e382999244e80ecdd50b411d755a24f8d73fc70 (diff) | |
guard against null Foundry
Change-Id: I8aabc68e8dfb9376cafe4cc709b18344da083a01
(cherry picked from commit 2f0fba494e78ede3b6691534983f6dd7e0677a7e)
(cherry picked from commit 51a1b41ab4a840544e5454d1d4234b443edd5466)
Reviewed-on: https://gerrit.libreoffice.org/20755
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit f1c1380c3257b27c558145a33c7b6d6e0fdf2957)
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/source/filter/lwpfrib.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index e1a9b8cc659e..d578007f8a0e 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -250,14 +250,14 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) m_StyleName.clear(); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); XFTextStyle* pNamedStyle = nullptr; - if (m_pModifiers->HasCharStyle) + if (m_pModifiers->HasCharStyle && pFoundry) { pNamedStyle = static_cast<XFTextStyle*> (pFoundry->GetStyleManager()->GetStyle(m_pModifiers->CharStyleID)); } if (pNamedStyle) { - if (m_pModifiers->FontID) + if (m_pModifiers->FontID && pFoundry) { pStyle = new XFTextStyle(); *pStyle = *pNamedStyle; @@ -277,7 +277,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) } else { - if (m_pModifiers->FontID) + if (m_pModifiers->FontID && pFoundry) { pStyle = new XFTextStyle(); pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID); |