From a4bc9a43198074b529693f1852093d8d72eaae98 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 4 Apr 2016 10:36:26 +0100 Subject: currentlayout may be null Change-Id: I1e53482e722b82f052434f45e37a2fbdb2ea6ffc --- lotuswordpro/qa/cppunit/data/fail/null-1.lwp | Bin 0 -> 15952 bytes lotuswordpro/source/filter/lwpfribsection.cxx | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 lotuswordpro/qa/cppunit/data/fail/null-1.lwp diff --git a/lotuswordpro/qa/cppunit/data/fail/null-1.lwp b/lotuswordpro/qa/cppunit/data/fail/null-1.lwp new file mode 100644 index 000000000000..06b8254431df Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/null-1.lwp differ diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx index cd6884b59c73..2d992f1d31fc 100644 --- a/lotuswordpro/source/filter/lwpfribsection.cxx +++ b/lotuswordpro/source/filter/lwpfribsection.cxx @@ -314,11 +314,11 @@ void LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) XFSectionStyle* pSectStyle= new XFSectionStyle(); //set margin pStory = dynamic_cast(m_pPara->GetStoryID().obj().get()); - if (pStory) + LwpPageLayout* pCurrentLayout = pStory ? pStory->GetCurrentLayout() : nullptr; + if (pCurrentLayout) { - LwpPageLayout* pCurrentLayout = pStory->GetCurrentLayout(); - double fLeft = m_pLayout->GetMarginsValue(MARGIN_LEFT)- pCurrentLayout->GetMarginsValue(MARGIN_LEFT); - double fRight = m_pLayout->GetMarginsValue(MARGIN_RIGHT)- pCurrentLayout->GetMarginsValue(MARGIN_RIGHT); + double fLeft = m_pLayout->GetMarginsValue(MARGIN_LEFT) - pCurrentLayout->GetMarginsValue(MARGIN_LEFT); + double fRight = m_pLayout->GetMarginsValue(MARGIN_RIGHT) - pCurrentLayout->GetMarginsValue(MARGIN_RIGHT); pSectStyle->SetMarginLeft(fLeft); pSectStyle->SetMarginRight(fRight); } -- cgit