diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-04-09 15:35:43 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2016-04-10 21:24:15 +0200 |
commit | a3f7849844d85dca6a58c4e621252ee3d5e0c688 (patch) | |
tree | 67918d7f7e3dc5ba3d0d13902fc5c8caa4e7edc7 | |
parent | 168f8730e670a4ab6adef4fe7b48ed080af8b914 (diff) |
pCont can be null
Change-Id: I7af6c5f4a14e330924a1ea12ebb6328884b8a565
(cherry picked from commit 617bbc9da95f7e4b13e3a999fd3085a4fee23ae4)
Reviewed-on: https://gerrit.libreoffice.org/23937
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 23e3075976024da2b94dc432b38568f2cf7c402f)
-rw-r--r-- | lotuswordpro/qa/cppunit/data/pass/null-1.lwp | bin | 0 -> 17632 bytes | |||
-rw-r--r-- | lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lotuswordpro/qa/cppunit/data/pass/null-1.lwp b/lotuswordpro/qa/cppunit/data/pass/null-1.lwp Binary files differnew file mode 100644 index 000000000000..351d7e88ef37 --- /dev/null +++ b/lotuswordpro/qa/cppunit/data/pass/null-1.lwp diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx index 933f239bd5fa..7d7828407b46 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx @@ -293,7 +293,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); |