diff options
| author | Kai Ahrens <ka@openoffice.org> | 2002-05-17 06:53:08 +0000 |
|---|---|---|
| committer | Kai Ahrens <ka@openoffice.org> | 2002-05-17 06:53:08 +0000 |
| commit | e41be41bea897073b7e70a5d54ef060b3b829272 (patch) | |
| tree | bbe5d6874719dcac2e5aabb3aea644b9f4a7b966 /svtools/source/filerec/filerec.cxx | |
| parent | eab4479c9dca6f79e00c6533935b5703ed4fabbe (diff) | |
#99366#: check/correct stream pos in every case (::GetContent)
Diffstat (limited to 'svtools/source/filerec/filerec.cxx')
| -rw-r--r-- | svtools/source/filerec/filerec.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/svtools/source/filerec/filerec.cxx b/svtools/source/filerec/filerec.cxx index 075090e9b076..c1f0c97eb08c 100644 --- a/svtools/source/filerec/filerec.cxx +++ b/svtools/source/filerec/filerec.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filerec.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:58:59 $ + * last change: $Author: ka $ $Date: 2002-05-17 07:53:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1017,8 +1017,14 @@ FASTBOOL SfxMultiRecordReader::GetContent() : SFX_REC_CONTENT_OFS(_pContentOfs[_nContentNo]); UINT32 nNewPos = _nStartPos + nOffset; DBG_ASSERT( nNewPos >= _pStream->Tell(), "SfxMultiRecordReader::GetContent() - New position before current, to much data red!" ); - if ( nNewPos > _pStream->Tell() ) - _pStream->Seek( nNewPos ); + + // #99366#: correct stream pos in every case; + // the if clause was added by MT a long time ago, + // maybe to 'repair' other corrupt documents; but this + // gives errors when writing with 5.1 and reading with current + // versions, so we decided to remove the if clause (KA-05/17/2002) + // if ( nNewPos > _pStream->Tell() ) + _pStream->Seek( nNewPos ); // ggf. Content-Header lesen if ( _nRecordType == SFX_REC_TYPE_MIXTAGS || |