[Libreoffice-commits] core.git: sc/source

Caolán McNamara caolanm at redhat.com
Thu Nov 16 16:41:28 UTC 2017


 sc/source/filter/excel/xistream.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 454537e4a285b01807aa553ee9c70acd4806d93c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 16 10:21:06 2017 +0000

    ofz#4243 Timeout
    
    Change-Id: I00767cfd99634f0ccd22e63cf0d635a2f75bc224
    Reviewed-on: https://gerrit.libreoffice.org/44806
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index ad63bb073b5a..6624599e2867 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -963,9 +963,8 @@ void XclImpStream::RestorePosition( const XclImpStreamPos& rPos )
 
 bool XclImpStream::ReadNextRawRecHeader()
 {
-    std::size_t nSeekedPos = mrStrm.Seek( mnNextRecPos );
-    bool bRet = (nSeekedPos == mnNextRecPos) && (mnNextRecPos + 4 <= mnStreamSize);
-    if( bRet )
+    bool bRet = checkSeek(mrStrm, mnNextRecPos) && (mnNextRecPos + 4 <= mnStreamSize);
+    if (bRet)
     {
         mrStrm.ReadUInt16( mnRawRecId ).ReadUInt16( mnRawRecSize );
         bRet = mrStrm.good();


More information about the Libreoffice-commits mailing list