[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

Caolán McNamara caolanm at redhat.com
Sun Dec 13 03:05:39 PST 2015


 lotuswordpro/source/filter/lwppagelayout.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 32368647339bf16c43899b29627030eb64893357
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 13 11:04:43 2015 +0000

    protect against missing Foundry
    
    Change-Id: Ie5c0317f842258fe42f894dbace0ea0e328f288a
    (cherry picked from commit ddc7d96a399822c2f29dcaca8222dfb96c383576)

diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 3547661..e7fd45d 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -576,6 +576,8 @@ sal_Int32 LwpPageLayout::GetPageNumber(sal_uInt16 nLayoutNumber)
 {
     sal_Int16 nPageNumber = -1;
     LwpFoundry* pFoundry = this->GetFoundry();
+    if (!pFoundry)
+        return nPageNumber;
     LwpDocument* pDoc = pFoundry->GetDocument();
     LwpDLVListHeadTailHolder* pHeadTail = dynamic_cast<LwpDLVListHeadTailHolder*>(pDoc->GetPageHintsID().obj().get());
     if(!pHeadTail) return nPageNumber;


More information about the Libreoffice-commits mailing list