diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-02 22:37:33 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2011-08-03 10:56:52 +0100 |
| commit | 69137bc93d54d77146ae66682fc77c1a5f315518 (patch) | |
| tree | 1f8b7aa48ba5d01cdb0329110421bc789df12f2b | |
| parent | a0ee5c4518d7634c328909a1988ab2d69b2c317f (diff) | |
Related: #i38880# crash in new field code
Signed-off-by: Noel Power <noel.power@novell.com>
| -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 e393472854..65aa924e82 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2709,10 +2709,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; } } |