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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpfribmark.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5ae038d2341e4a7f8dedb77be75efd557d01bcc9
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sun Dec 27 20:14:27 2015 +0000

    guard against missing Foundry
    
    Change-Id: I5ba66ff020b8226ac01af985f68c3ef67057c01a
    (cherry picked from commit 7f9b57bda4d88262ecbe45188888c744913b9770)

diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx 
b/lotuswordpro/source/filter/lwpfribmark.cxx
index e6824c3..f562e38 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -128,12 +128,12 @@ void LwpFribCHBlock::XFConvert(XFContentContainer* 
pXFPara,LwpStory* pStory)
 void  LwpFribBookMark::RegisterStyle(LwpFoundry* pFoundry)
 {
     OUString name;
-    LwpBookMark* pBook = pFoundry->GetBookMark(GetMarkerID());
+    LwpBookMark* pBook = pFoundry ? pFoundry->GetBookMark(GetMarkerID()) : 
nullptr;
     if (pBook)
         name = pBook->GetName();
 
     OUString sDivision;
-    LwpDocument* pDoc = pFoundry->GetDocument();
+    LwpDocument* pDoc = pFoundry ? pFoundry->GetDocument() : nullptr;
     if (pDoc)
     {
         LwpObjectID& rID = pDoc->GetDivInfoID();

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits