[Libreoffice-commits] core.git: sw/source

[Jan Holesovsky]

 sw/source/filter/ww8/ww8par.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 9fb856ce844f2a4e794687c00ad6f0f75ef223c1
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 12 14:58:39 2013 +0200

    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

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8b4f9f2..6d890de 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4808,12 +4808,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);
+                                }
                             }
                         }
                     }