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

[Caolán McNamara]

 lotuswordpro/source/filter/lwptablelayout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 55b886584ee6b4cd64b45908b00eb34167d28e83
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 10 13:40:17 2015 +0000

    guard against missing HeadHolder
    
    Change-Id: Ic12ee6f4366285fc05fd59b94ec371d8ca013a4a
    (cherry picked from commit ca868de5e41b45a077949e40ef80f063c362892b)

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 0a2f789..071c971 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1106,7 +1106,7 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
 
         LwpDLVListHeadHolder* pHolder = static_cast<LwpDLVListHeadHolder*>(pFoundry->GetNumberManager().GetTableRangeID().obj().get());
 
-        LwpTableRange* pTableRange = static_cast<LwpTableRange*>(pHolder->GetHeadID().obj().get());
+        LwpTableRange* pTableRange = pHolder ? static_cast<LwpTableRange*>(pHolder->GetHeadID().obj().get()) : nullptr;
 
         //Look up the table
         while (nullptr!=pTableRange)