lotuswordpro/source/filter/lwpframelayout.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 6fac6b9cd02a3f26edd800b312ceca7a1c19ee52 Author: Caolán McNamara <[email protected]> Date: Thu Dec 10 10:24:19 2015 +0000 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 <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx index d902a04..a3295c7 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,
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
