summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-17 10:52:13 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-12-17 10:52:36 +0000
commit2f0fba494e78ede3b6691534983f6dd7e0677a7e (patch)
treeb32933bd971e4a1e21b0e12eac09ff6db6c08ec5 /lotuswordpro
parentdab2582f05979cd99a5937cb95a387cfed70bb8d (diff)
guard against null Foundry
Change-Id: I8aabc68e8dfb9376cafe4cc709b18344da083a01
Diffstat (limited to 'lotuswordpro')
-rw-r--r--lotuswordpro/source/filter/lwpfrib.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index d9ae6f072052..2c69886ff64f 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -246,14 +246,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;
@@ -273,7 +273,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);