summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-04-08 09:25:46 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-04-08 09:29:54 +0100
commitb7bf06d5d6f640df1304b605a2eaa5276f998dcb (patch)
tree0151fb2aa362bedc62778b365cf915e7435d5116 /lotuswordpro
parent788616fe7ce7c56d9dcfccafdd3e1f55036aa8a7 (diff)
foundry may be null
Change-Id: I39359389a42e35e0131db1d0451fbd5531843f75
Diffstat (limited to 'lotuswordpro')
-rw-r--r--lotuswordpro/qa/cppunit/data/fail/null-2.lwpbin0 -> 22368 bytes
-rw-r--r--lotuswordpro/source/filter/lwpfrib.cxx3
2 files changed, 2 insertions, 1 deletions
diff --git a/lotuswordpro/qa/cppunit/data/fail/null-2.lwp b/lotuswordpro/qa/cppunit/data/fail/null-2.lwp
new file mode 100644
index 000000000000..cd7e07278e8d
--- /dev/null
+++ b/lotuswordpro/qa/cppunit/data/fail/null-2.lwp
Binary files differ
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index f0673e992056..64f49eecef2a 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -425,7 +425,8 @@ rtl::Reference<XFFont> LwpFrib::GetFont()
if(m_pModifiers&&m_pModifiers->FontID)
{
LwpFoundry* pFoundry = m_pPara->GetFoundry();
- pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID);
+ if (pFoundry)
+ pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID);
}
else
{