[Libreoffice-commits] core.git: lotuswordpro/source

[Caolán McNamara]

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

New commits:
commit f9164c1785432996092d376fb3983e1a3f78dad7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 10 12:14:54 2015 +0000

    guard against missing grandfather layout
    
    Change-Id: I1282b2c3c920ef89460aa57026d89c8928155116

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index eef52a9..b26f063 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -190,7 +190,7 @@ void  LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
     LwpVirtualLayout* pParent = m_pLayout->GetParentLayout();
     if (!pParent)
         throw std::runtime_error("missing Parent Layout");
-    if(pParent->IsPage()&& pParent->GetParentLayout()->IsPage())
+    if (pParent->IsPage() && pParent->GetParentLayout() && pParent->GetParentLayout()->IsPage())
     {
         //for mirror page, problems exist if the parent layout is header or footer layout,
         pParent = pParent->GetParentLayout();