summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-04-08 09:25:46 +0100
committerMichael Stahl <mstahl@redhat.com>2016-04-08 10:03:29 +0000
commit674fc004a5c5adcce4bb2c2841298431a79c01f2 (patch)
tree65ab5c33ed7e0bb4983bd84dd2265c4b811d694c /lotuswordpro
parent8aa9fac23bc8f29de5e91293352f96c99418ddfc (diff)
foundry may be null
Change-Id: I39359389a42e35e0131db1d0451fbd5531843f75 (cherry picked from commit b7bf06d5d6f640df1304b605a2eaa5276f998dcb) Reviewed-on: https://gerrit.libreoffice.org/23910 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
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 230437b225f6..8d8ceab439e2 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
{