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

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/pass/null-1.lwp     |binary
 lotuswordpro/source/filter/lwpbulletstylemgr.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e7e61b4e06e1285f5f8e89a46774b883d9fe0282
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 9 15:35:43 2016 +0100

    pCont can be null
    
    Change-Id: I7af6c5f4a14e330924a1ea12ebb6328884b8a565
    (cherry picked from commit 617bbc9da95f7e4b13e3a999fd3085a4fee23ae4)
    Reviewed-on: https://gerrit.libreoffice.org/23936
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/lotuswordpro/qa/cppunit/data/pass/null-1.lwp b/lotuswordpro/qa/cppunit/data/pass/null-1.lwp
new file mode 100644
index 0000000..351d7e8
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/pass/null-1.lwp differ
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 48cb737..358655a 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -287,7 +287,7 @@ XFContentContainer* LwpBulletStyleMgr::AddBulletList(
             theList->SetContinueNumber(bContinue);
         }
         //Add the outer list to pCont
-        if (nC == 0)
+        if (nC == 0 && pCont)
         {
             theList->SetStyleName(rStyleName);
             pCont->Add(theList);