diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2002-05-16 12:01:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2002-05-16 12:01:57 +0000 |
| commit | 104d1199b438c67c40dcc80c3897c6522089630d (patch) | |
| tree | 3e214b7087d5cd7315e9a7a1a11b37086ab2b6d1 /sw/source/filter/ww8/ww8par3.cxx | |
| parent | 6eec92169c6cdcb7a7bce7e29865eb4465bdb924 (diff) | |
#i3942# #i4702# Make filter robust once and for all against unknown sprms
Diffstat (limited to 'sw/source/filter/ww8/ww8par3.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 9c514e6eca37..67aec4251dde 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par3.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: cmc $ $Date: 2002-05-11 14:06:35 $ + * last change: $Author: cmc $ $Date: 2002-05-16 13:01:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -480,7 +480,7 @@ sal_uInt8* WW8ListManager::GrpprlHasSprm(sal_uInt16 nId, sal_uInt8& rSprms, sal_uInt8 nDelta; sal_uInt16 nAktId = WW8GetSprmId(rFib.nVersion, pSprms, &nDelta ); if( nAktId == nId ) // Sprm found - return pSprms + 1 + nDelta + WW8SprmDataOfs( nId ); + return pSprms + 1 + nDelta + WW8SprmDataOfs(rFib.nVersion, nId ); // gib Zeiger auf Daten USHORT x = WW8GetSprmSize(rFib.nVersion, pSprms, &nAktId ); i += x; @@ -1764,7 +1764,8 @@ BOOL SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula, if ( (68 == aRes.nSprmId) || (0x6A03 == aRes.nSprmId) ) { Read_PicLoc( aRes.nSprmId, aRes.pMemPos+ 1+ - (8 > pWwFib->nVersion ? 0 : 1) + WW8SprmDataOfs(aRes.nSprmId), + (8 > pWwFib->nVersion ? 0 : 1) + WW8SprmDataOfs( + pWwFib->nVersion, aRes.nSprmId), 4); break; } |