|
 |
20aa85 |
From 368116f6d97e9bf10a6e12368191cd42844902b5 Mon Sep 17 00:00:00 2001
|
|
|
20aa85 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
20aa85 |
Date: Sat, 27 Jan 2018 19:38:12 +0000
|
|
|
20aa85 |
Subject: [PATCH] ofz#5747 short->sal_Int32 like in StgDataStrm
|
|
|
20aa85 |
MIME-Version: 1.0
|
|
|
20aa85 |
Content-Type: text/plain; charset=UTF-8
|
|
|
20aa85 |
Content-Transfer-Encoding: 8bit
|
|
|
20aa85 |
|
|
|
20aa85 |
Change-Id: I254c00b1142d7187beabe5d18532efec036de494
|
|
|
20aa85 |
Reviewed-on: https://gerrit.libreoffice.org/48751
|
|
|
20aa85 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
20aa85 |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
20aa85 |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
20aa85 |
---
|
|
|
20aa85 |
sot/source/sdstor/stgstrms.cxx | 8 ++++----
|
|
|
20aa85 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
20aa85 |
|
|
|
20aa85 |
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
|
|
|
20aa85 |
index 7063a4c..d9ec341 100644
|
|
|
20aa85 |
--- a/sot/source/sdstor/stgstrms.cxx
|
|
|
20aa85 |
+++ b/sot/source/sdstor/stgstrms.cxx
|
|
|
20aa85 |
@@ -1047,7 +1047,7 @@ sal_Int32 StgSmallStrm::Read( void* pBuf, sal_Int32 n )
|
|
|
20aa85 |
// small stream is likely to be < 64 KBytes.
|
|
|
20aa85 |
if( ( m_nPos + n ) > m_nSize )
|
|
|
20aa85 |
n = m_nSize - m_nPos;
|
|
|
20aa85 |
- short nDone = 0;
|
|
|
20aa85 |
+ sal_Int32 nDone = 0;
|
|
|
20aa85 |
while( n )
|
|
|
20aa85 |
{
|
|
|
20aa85 |
short nBytes = m_nPageSize - m_nOffset;
|
|
|
20aa85 |
@@ -1059,7 +1059,7 @@ sal_Int32 StgSmallStrm::Read( void* pBuf, sal_Int32 n )
|
|
|
20aa85 |
break;
|
|
|
20aa85 |
// all reading through the stream
|
|
|
20aa85 |
short nRes = (short) m_pData->Read( static_cast<sal_uInt8*>(pBuf) + nDone, nBytes );
|
|
|
20aa85 |
- nDone = nDone + nRes;
|
|
|
20aa85 |
+ nDone += nRes;
|
|
|
20aa85 |
m_nPos += nRes;
|
|
|
20aa85 |
n -= nRes;
|
|
|
20aa85 |
m_nOffset = m_nOffset + nRes;
|
|
|
20aa85 |
@@ -1078,7 +1078,7 @@ sal_Int32 StgSmallStrm::Write( const void* pBuf, sal_Int32 n )
|
|
|
20aa85 |
{
|
|
|
20aa85 |
// you can safely assume that reads are not huge, since the
|
|
|
20aa85 |
// small stream is likely to be < 64 KBytes.
|
|
|
20aa85 |
- short nDone = 0;
|
|
|
20aa85 |
+ sal_Int32 nDone = 0;
|
|
|
20aa85 |
if( ( m_nPos + n ) > m_nSize )
|
|
|
20aa85 |
{
|
|
|
20aa85 |
sal_Int32 nOld = m_nPos;
|
|
|
20aa85 |
@@ -1102,7 +1102,7 @@ sal_Int32 StgSmallStrm::Write( const void* pBuf, sal_Int32 n )
|
|
|
20aa85 |
if( !m_pData->Pos2Page( nDataPos ) )
|
|
|
20aa85 |
break;
|
|
|
20aa85 |
short nRes = (short) m_pData->Write( static_cast<sal_uInt8 const *>(pBuf) + nDone, nBytes );
|
|
|
20aa85 |
- nDone = nDone + nRes;
|
|
|
20aa85 |
+ nDone += nRes;
|
|
|
20aa85 |
m_nPos += nRes;
|
|
|
20aa85 |
n -= nRes;
|
|
|
20aa85 |
m_nOffset = m_nOffset + nRes;
|
|
|
20aa85 |
--
|
|
|
20aa85 |
2.14.3
|
|
|
20aa85 |
|