diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-02 22:37:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-03 10:35:38 +0100 |
| commit | d66a06ce6af94482fe45410672d64eb864fb2e2e (patch) | |
| tree | 6e02b98f142d1a3da67b0e39804c84097178dffb /sw | |
| parent | aba21efaac19452e281e3d151e8f433c680c736e (diff) | |
Related: #i38880# crash in new field code
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index fe51ef48dcd6..08ae5ce459af 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2712,10 +2712,13 @@ void SwWW8ImplReader::Read_Obj(sal_uInt16 , const sal_uInt8* pData, short nLen) if( bObj && nPicLocFc && bEmbeddObj ) { - if ( maFieldStack.back().mnFieldId == 56 ) { + if (!maFieldStack.empty() && maFieldStack.back().mnFieldId == 56) + { // For LINK fields, store the nObjLocFc value in the field entry maFieldStack.back().mnObjLocFc = nPicLocFc; - } else { + } + else + { nObjLocFc = nPicLocFc; } } |