[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sot/source

[Tor Lillqvist]

 sot/source/sdstor/stgdir.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1d66d2233cc4b458d3ad3bdad8682828f5fb321a
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.
    
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>

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;
             }