strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ofz#2976 Timeout

Browse source 
Change-Id: Iff085d6bdbbfc7f2c821fdcef8e412aa91152d93
Reviewed-on: https://gerrit.libreoffice.org/48804
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2018-01-28 21:02:56 +00:00
parent 5426a14e39
commit bfc04bc43e
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
sot/qa/cppunit/data/pass/next-page-1.compound → sot/qa/cppunit/data/fail/next-page-1.compound
View file

2
sot/source/sdstor/stgio.cxx
View file

@ -279,7 +279,7 @@ FatError Validator::ValidateMasterFATs()
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;
}
if( rIo.m_aHdr.GetMasters() )

4
sot/source/sdstor/stgstrms.cxx
View file

@ -588,13 +588,13 @@ bool StgFATStrm::Pos2Page( sal_Int32 nBytePos )
m_nPage = nBytePos / m_nPageSize;
m_nOffset = static_cast<short>( nBytePos % m_nPageSize );
m_nPos = nBytePos;
m_nPage = GetPage( static_cast<short>(m_nPage), false );
m_nPage = GetPage(m_nPage, false);
return m_nPage >= 0;
}
// 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!" );
if( pnMasterAlloc ) *pnMasterAlloc = 0;

2
sot/source/sdstor/stgstrms.hxx
View file

@ -103,7 +103,7 @@ class StgFATStrm : public StgStrm { // the master FAT stream
public:
explicit StgFATStrm(StgIo&, sal_Int32 nFatStrmSize);
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;
};