Kaydet (Commit) 0797b27f authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) Miklos Vajna

bnc#816603, i#101884: Fix crash on load.

This was originally fixed in commit 792cbc03
due to fix of i#99564.

But later we reworked the handling of empty paragraphs in tables in commit
56b2cf0c, which caused the fix from i#99564
to regress.

Change-Id: Ief063181cee87c7cd43404469247d85eb96bcfe1
(cherry picked from commit 9fb856ce)
üst 6e3f2fbc
......@@ -4798,12 +4798,15 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
{
SwFrmFmt *pFrmFmt = pHt->GetFlyCnt().GetFrmFmt();
const SwNodeIndex *pNdIdx = pFrmFmt->GetCntnt().GetCntntIdx();
const SwNodes &nos = pNdIdx->GetNodes();
const SwGrfNode *pGrf = dynamic_cast<const SwGrfNode*>(nos[pNdIdx->GetIndex() + 1]);
if (pGrf)
if (pNdIdx)
{
vecBulletGrf.push_back(pGrf);
vecFrmFmt.push_back(pFrmFmt);
const SwNodes &nos = pNdIdx->GetNodes();
const SwGrfNode *pGrf = dynamic_cast<const SwGrfNode*>(nos[pNdIdx->GetIndex() + 1]);
if (pGrf)
{
vecBulletGrf.push_back(pGrf);
vecFrmFmt.push_back(pFrmFmt);
}
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment