diff options
| author | Katarina Machalkova <kmachalkova@novell.com> | 2011-07-07 16:14:30 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-07 16:18:55 +0300 |
| commit | 1d66d2233cc4b458d3ad3bdad8682828f5fb321a (patch) | |
| tree | fc3bf5e61a0bb61008bf64183aca78e2cbf21590 | |
| parent | 3e89e510bf9974f75a81baf13dc59f6e137ec9a9 (diff) | |
Duplicate entries in Directory definition are no longer treated as errors
Fixes a problem where cetain XLS documents open as blank in
LibreOffice.
Described in the non-public bnc#682484.
Signed-off-by: Tor Lillqvist <tlillqvist@novell.com>
| -rw-r--r-- | sot/source/sdstor/stgdir.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index fcaa3d3872..eb9fd8c256 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -853,7 +853,10 @@ void StgDirStrm::SetupEntry( sal_Int32 n, StgDirEntry* pUpper ) } else { - rIo.SetError( SVSTREAM_CANNOT_MAKE ); + // bnc#682484: There are some really broken docs out there + // that contain duplicate entries in 'Directory' section + // so don't set the error flag here and just skip those + // (was: rIo.SetError( SVSTREAM_CANNOT_MAKE );) delete pCur; pCur = NULL; return; } |