diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-17 10:52:13 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-03-01 22:20:47 +0100 |
| commit | f6625f29f2452a01282ec3a39c146c1ac4ea2ff7 (patch) | |
| tree | a83805f6cbe1a936ad7f1a1ee997c53cf16ef866 | |
| parent | 469116f2f8c8fc76a7a6c3fdd69dd9264937536e (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)
| -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 138d2064a9ed..79de8dcfaaa5 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -250,14 +250,14 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) m_StyleName = ""; 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); |