summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorKatarina Machalkova <kmachalkova@novell.com>2011-07-07 16:14:30 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-07-07 16:39:23 +0300
commit3b88fce03981b6c54ae545cece8bb3843be5143f (patch)
tree7a0fc156c5a5fdf36fcb0fd585144e5f2d6af628 /sot
parent930450f44e1d7b1f4490dea47c5825972490a74f (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.
Diffstat (limited to 'sot')
-rw-r--r--sot/source/sdstor/stgdir.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 4951daa70a6c..fc9610a6af3b 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;
}