use sal_uInt64 when dealing with stream position
Change-Id: I2869e115941b3e1f52911d58d54ec1b2831d0524 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155524 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
parent
55c0d6caec
commit
da54fbce1c
4 changed files with 6 additions and 6 deletions
|
@ -116,7 +116,7 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, co
|
|||
pStream.Flush();
|
||||
if ( !nFailed )
|
||||
{
|
||||
sal_Int32 nLength = pStream.TellEnd();
|
||||
sal_uInt64 nLength = pStream.TellEnd();
|
||||
if ( nLength > 22 )
|
||||
{
|
||||
HMETAFILE hMeta = SetMetaFileBitsEx( nLength - 22,
|
||||
|
|
|
@ -1300,8 +1300,8 @@ std::size_t StgTmpStrm::GetData( void* pData, std::size_t n )
|
|||
|
||||
std::size_t StgTmpStrm::PutData( const void* pData, std::size_t n )
|
||||
{
|
||||
sal_uInt32 nCur = Tell();
|
||||
sal_uInt32 nNew = nCur + n;
|
||||
sal_uInt64 nCur = Tell();
|
||||
sal_uInt64 nNew = nCur + n;
|
||||
if( nNew > THRESHOLD && !m_pStrm )
|
||||
{
|
||||
SetSize( nNew );
|
||||
|
|
|
@ -253,9 +253,9 @@ sal_Int64 SAL_CALL FileStreamWrapper_Impl::getPosition( )
|
|||
std::scoped_lock aGuard( m_aMutex );
|
||||
checkConnected();
|
||||
|
||||
sal_uInt32 nPos = m_pSvStream->Tell();
|
||||
sal_uInt64 nPos = m_pSvStream->Tell();
|
||||
checkError();
|
||||
return static_cast<sal_Int64>(nPos);
|
||||
return nPos;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1915,7 +1915,7 @@ bool MathType::ConvertFromStarMath( SfxMedium& rMedium )
|
|||
pS->WriteUChar( 0x01 );
|
||||
pS->WriteUChar( 0x03 );
|
||||
pS->WriteUChar( 0x00 );
|
||||
sal_uInt32 nSize = pS->Tell();
|
||||
sal_uInt64 nSize = pS->Tell();
|
||||
nPendingAttributes=0;
|
||||
|
||||
HandleNodes(pTree, 0);
|
||||
|
|
Loading…
Reference in a new issue