summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-10 10:24:19 +0000
committerAndras Timar <andras.timar@collabora.com>2016-03-01 22:16:54 +0100
commitcebca5675e9461be59c6873d2feea5c669b07dcc (patch)
tree580aa99dddb713fa430b2c01729ce3fda260a5b3
parentf7b8a305368ee7a9fb2cc003c9ba127888a1e238 (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/20586 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 6fac6b9cd02a3f26edd800b312ceca7a1c19ee52)
-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 d902a0491a22..a3295c70e014 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,