summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-04-04 10:36:26 +0100
committerDavid Tardon <dtardon@redhat.com>2016-04-05 05:49:28 +0000
commit51b4af045d670c67f107922b2137fea49e042606 (patch)
treef851c4fe24de81626cc95abe8aa01f11aee4fdcd
parentc64235f4928754120a6a0817a1368b7abc924f8d (diff)
currentlayout may be null
Change-Id: I1e53482e722b82f052434f45e37a2fbdb2ea6ffc (cherry picked from commit a4bc9a43198074b529693f1852093d8d72eaae98) Reviewed-on: https://gerrit.libreoffice.org/23804 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
-rw-r--r--lotuswordpro/qa/cppunit/data/fail/null-1.lwpbin0 -> 15952 bytes
-rw-r--r--lotuswordpro/source/filter/lwpfribsection.cxx8
2 files changed, 4 insertions, 4 deletions
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
--- /dev/null
+++ b/lotuswordpro/qa/cppunit/data/fail/null-1.lwp
Binary files differ
diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx
index 74cc81d78024..b5c457ab1734 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);
}