[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source
Caolán McNamara
caolanm at redhat.com
Thu Dec 10 07:16:27 PST 2015
lotuswordpro/source/filter/lwppagelayout.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bee28cc24a864f6953dcda65df53e34fbc10cb6e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 10 09:42:04 2015 +0000
guard against missing Foundry
Change-Id: I9147dc2bab312639a04d2e822cf99745d38d3b8d
(cherry picked from commit 22ee3194c930682ad8ac7f994084e877aa00d191)
Reviewed-on: https://gerrit.libreoffice.org/20575
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 08b7615..95e49d7 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -267,8 +267,8 @@ void LwpPageLayout::ParseBackColor(XFPageMaster* pm1)
void LwpPageLayout::ParseFootNoteSeparator(XFPageMaster * pm1)
{
//Get the footnoteoptions for the root document
- LwpDocument* pDocument = m_pFoundry->GetDocument();
- if(pDocument)
+ LwpDocument* pDocument = m_pFoundry ? m_pFoundry->GetDocument() : nullptr;
+ if (pDocument)
{
LwpObjectID* pFontnodeId = pDocument->GetValidFootnoteOpts();
More information about the Libreoffice-commits
mailing list