diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-04-08 09:25:46 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-04-10 21:23:54 +0200 |
| commit | 1f2d5d96389f550a87e2c954da0bad9496ab78e9 (patch) | |
| tree | 54879699e669192602737ab299d05a4b15a63062 /lotuswordpro | |
| parent | 08c0afe3efb776b28316423b3654f8879039f67e (diff) | |
foundry may be null
Change-Id: I39359389a42e35e0131db1d0451fbd5531843f75
(cherry picked from commit b7bf06d5d6f640df1304b605a2eaa5276f998dcb)
Reviewed-on: https://gerrit.libreoffice.org/23911
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 88bd2f2037870b2c11688b22160d5d1d6df46172)
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/qa/cppunit/data/fail/null-2.lwp | bin | 0 -> 22368 bytes | |||
| -rw-r--r-- | lotuswordpro/source/filter/lwpfrib.cxx | 3 |
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 Binary files differnew file mode 100644 index 000000000000..cd7e07278e8d --- /dev/null +++ b/lotuswordpro/qa/cppunit/data/fail/null-2.lwp diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index 96833c7a164d..a1b62b4217ab 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -429,7 +429,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 { |