Kaydet (Commit) bfc04bc4 authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz#2976 Timeout

Change-Id: Iff085d6bdbbfc7f2c821fdcef8e412aa91152d93
Reviewed-on: https://gerrit.libreoffice.org/48804Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 5426a14e
...@@ -279,7 +279,7 @@ FatError Validator::ValidateMasterFATs() ...@@ -279,7 +279,7 @@ FatError Validator::ValidateMasterFATs()
for( sal_Int32 i = 0; i < nCount; i++ ) for( sal_Int32 i = 0; i < nCount; i++ )
{ {
if( ( nErr = aFat.Mark(rIo.m_pFAT->GetPage( short(i), false ), aFat.GetPageSize(), -3 )) != FatError::Ok ) if( ( nErr = aFat.Mark(rIo.m_pFAT->GetPage(i, false), aFat.GetPageSize(), -3 )) != FatError::Ok)
return nErr; return nErr;
} }
if( rIo.m_aHdr.GetMasters() ) if( rIo.m_aHdr.GetMasters() )
......
...@@ -588,13 +588,13 @@ bool StgFATStrm::Pos2Page( sal_Int32 nBytePos ) ...@@ -588,13 +588,13 @@ bool StgFATStrm::Pos2Page( sal_Int32 nBytePos )
m_nPage = nBytePos / m_nPageSize; m_nPage = nBytePos / m_nPageSize;
m_nOffset = static_cast<short>( nBytePos % m_nPageSize ); m_nOffset = static_cast<short>( nBytePos % m_nPageSize );
m_nPos = nBytePos; m_nPos = nBytePos;
m_nPage = GetPage( static_cast<short>(m_nPage), false ); m_nPage = GetPage(m_nPage, false);
return m_nPage >= 0; return m_nPage >= 0;
} }
// Get the page number entry for the given page offset. // Get the page number entry for the given page offset.
sal_Int32 StgFATStrm::GetPage( short nOff, bool bMake, sal_uInt16 *pnMasterAlloc ) sal_Int32 StgFATStrm::GetPage(sal_Int32 nOff, bool bMake, sal_uInt16 *pnMasterAlloc)
{ {
OSL_ENSURE( nOff >= 0, "The offset may not be negative!" ); OSL_ENSURE( nOff >= 0, "The offset may not be negative!" );
if( pnMasterAlloc ) *pnMasterAlloc = 0; if( pnMasterAlloc ) *pnMasterAlloc = 0;
......
...@@ -103,7 +103,7 @@ class StgFATStrm : public StgStrm { // the master FAT stream ...@@ -103,7 +103,7 @@ class StgFATStrm : public StgStrm { // the master FAT stream
public: public:
explicit StgFATStrm(StgIo&, sal_Int32 nFatStrmSize); explicit StgFATStrm(StgIo&, sal_Int32 nFatStrmSize);
using StgStrm::GetPage; using StgStrm::GetPage;
sal_Int32 GetPage( short, bool, sal_uInt16 *pnMasterAlloc = nullptr); sal_Int32 GetPage(sal_Int32, bool, sal_uInt16 *pnMasterAlloc = nullptr);
virtual bool SetSize( sal_Int32 ) override; virtual bool SetSize( sal_Int32 ) override;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment