[Libreoffice-commits] core.git: sot/qa sot/source

[Caolán McNamara]

 sot/source/sdstor/stgio.cxx    |    2 +-
 sot/source/sdstor/stgstrms.cxx |    4 ++--
 sot/source/sdstor/stgstrms.hxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bfc04bc43e378c5d028200da7a49be978ce8d6c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 28 21:02:56 2018 +0000

    ofz#2976 Timeout
    
    Change-Id: Iff085d6bdbbfc7f2c821fdcef8e412aa91152d93
    Reviewed-on: https://gerrit.libreoffice.org/48804
    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/sot/qa/cppunit/data/pass/next-page-1.compound b/sot/qa/cppunit/data/fail/next-page-1.compound
similarity index 100%
rename from sot/qa/cppunit/data/pass/next-page-1.compound
rename to sot/qa/cppunit/data/fail/next-page-1.compound
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index fc7c5a9def55..a7e8863c6efd 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -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() )
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index efa03cd14d20..17958544d880 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -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;
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx
index 45c9a71aa8a6..0a6589f204f7 100644
--- a/sot/source/sdstor/stgstrms.hxx
+++ b/sot/source/sdstor/stgstrms.hxx
@@ -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;
 };