diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-04-12 14:58:39 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-13 15:23:40 +0200 |
| commit | 0797b27ff5b18abd3bbdcba7b7a361d0097fd93e (patch) | |
| tree | 42184414b9dbbeaf895a36e131bba91ae23879fb /sw | |
| parent | 6e3f2fbc479f60756a5c939da877c6485916ae83 (diff) | |
bnc#816603, i#101884: Fix crash on load.
This was originally fixed in commit 792cbc03aef3873ba89c61db708898d96d6a52f8
due to fix of i#99564.
But later we reworked the handling of empty paragraphs in tables in commit
56b2cf0c10d9caa01ebae1d80465e342d046a85c, which caused the fix from i#99564
to regress.
Change-Id: Ief063181cee87c7cd43404469247d85eb96bcfe1
(cherry picked from commit 9fb856ce844f2a4e794687c00ad6f0f75ef223c1)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 26cfd3e8bfc1..3cd43f933976 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -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); + } } } } |