summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-10 10:24:19 +0000
committerMichael Stahl <mstahl@redhat.com>2015-12-10 15:12:43 +0000
commit5710f2530b6ad2c3bcf76bd90cc13c2e7bf3f456 (patch)
treeb6323ec45fb1ee277b6216a5dfd620e6afd8e768
parentb88037b6c893ca93abb120cfda76f52ac0147ee4 (diff)
guard against missing parent layout
Change-Id: Ib08403edf805367c7392325fcfb66bc7ed4d6f6a (cherry picked from commit 713d737b1ff73e76c6543198ce9299e1c83ac147) (cherry picked from commit 5f469a2a1af8bff36fc3a5849a1500345febdba4) Reviewed-on: https://gerrit.libreoffice.org/20587 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--lotuswordpro/source/filter/lwpframelayout.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index 61325da000b0..6a2f9beb11b3 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -189,8 +189,10 @@ void LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
*/
void LwpFrame::XFConvert(XFContentContainer* pCont)
{
- //parse the frame which anchor to page
+ // parse the frame which anchor to page
LwpVirtualLayout* pParent = m_pLayout->GetParentLayout();
+ if (!pParent)
+ throw std::runtime_error("missing Parent Layout");
if(pParent->IsPage()&& pParent->GetParentLayout()->IsPage())
{
//for mirror page, problems exist if the parent layout is header or footer layout,