summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-01-27 19:38:12 +0000
committerMichael Stahl <Michael.Stahl@cib.de>2019-08-27 14:12:27 +0200
commit90e700fcf05cce9863e115874d9cff1336f250c6 (patch)
treead905338b1ef9f147127b2003cc6b4b7bb746a20
parentforcepoint #33 ensure payload is a EMFPPath (diff)
downloadcore-90e700fcf05cce9863e115874d9cff1336f250c6.tar.gz
core-90e700fcf05cce9863e115874d9cff1336f250c6.zip
ofz#5747 short->sal_Int32 like in StgDataStrm
Change-Id: I254c00b1142d7187beabe5d18532efec036de494 Reviewed-on: https://gerrit.libreoffice.org/48757 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 59cf6c6128f67d807de58fae2d7fae2b4909ad68)
-rw-r--r--sot/source/sdstor/stgstrms.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 4f749486c1cc..212949d546d2 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1047,7 +1047,7 @@ sal_Int32 StgSmallStrm::Read( void* pBuf, sal_Int32 n )
// small stream is likely to be < 64 KBytes.
if( ( m_nPos + n ) > m_nSize )
n = m_nSize - m_nPos;
- short nDone = 0;
+ sal_Int32 nDone = 0;
while( n )
{
short nBytes = m_nPageSize - m_nOffset;
@@ -1078,7 +1078,7 @@ sal_Int32 StgSmallStrm::Write( const void* pBuf, sal_Int32 n )
{
// you can safely assume that reads are not huge, since the
// small stream is likely to be < 64 KBytes.
- short nDone = 0;
+ sal_Int32 nDone = 0;
if( ( m_nPos + n ) > m_nSize )
{
sal_Int32 nOld = m_nPos;