[Libreoffice-commits] .: sot/source
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Jul 7 06:42:11 PDT 2011
sot/source/sdstor/stgdir.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit bb78121586b6dfbae96a92bcdb77cf2d73584ad9
Author: Katarina Machalkova <kmachalkova at novell.com>
Date: Thu Jul 7 16:14:30 2011 +0300
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.
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index fcaa3d3..eb9fd8c 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;
}
More information about the Libreoffice-commits
mailing list