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

[Caolán McNamara]

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

New commits:
commit 01ef568cbc3f33092c1ed3f04afced7cb85badf3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 18 17:06:17 2015 +0000

    guard against missing XFContentContainer
    
    Change-Id: Ic974159f816bae465339e1b9abd2e247bbc2f206
    (cherry picked from commit 0063b891424ba7023d376d12a7c54522bca087c6)
    (cherry picked from commit b2cc385892c24dba6481bff396d4125f58c92f65)
    Reviewed-on: https://gerrit.libreoffice.org/20795
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index ea746dd..e021833 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -880,7 +880,7 @@ void LwpPara::ParseDropcapContent()
  */
 void LwpPara::AddBreakBefore(XFContentContainer* pCont)
 {
-    if (!m_pBreaks)
+    if (!m_pBreaks || !pCont)
         return;
     if (m_pBreaks->IsPageBreakBefore())
     {