lotuswordpro/qa/cppunit/data/fail/null-1.lwp |binary lotuswordpro/source/filter/lwpfribsection.cxx | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 51b4af045d670c67f107922b2137fea49e042606 Author: Caolán McNamara <[email protected]> Date: Mon Apr 4 10:36:26 2016 +0100 currentlayout may be null Change-Id: I1e53482e722b82f052434f45e37a2fbdb2ea6ffc (cherry picked from commit a4bc9a43198074b529693f1852093d8d72eaae98) Reviewed-on: https://gerrit.libreoffice.org/23804 Tested-by: Jenkins <[email protected]> Reviewed-by: David Tardon <[email protected]> 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 0000000..06b8254 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 74cc81d..b5c457a 100644 --- a/lotuswordpro/source/filter/lwpfribsection.cxx +++ b/lotuswordpro/source/filter/lwpfribsection.cxx @@ -317,11 +317,11 @@ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) XFSectionStyle* pSectStyle= new XFSectionStyle(); //set margin pStory = dynamic_cast<LwpStory*>(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); }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
