lotuswordpro/source/filter/bencont.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
New commits: commit 28580d90305fcb159395b957b65275f94591bc38 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Jan 20 20:54:14 2018 +0000 use correct types Change-Id: I350f826f88bda85d3ea861ce7b05680900b850cf Reviewed-on: https://gerrit.libreoffice.org/48254 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index 6a03ba73a8f3..d3c046882e0f 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -253,11 +253,11 @@ LtcUtBenValueStream * LtcBenContainer::FindValueStreamWithPropertyName(const cha return FindNextValueStreamWithPropertyName(sPropertyName); } -sal_uInt32 GetSvStreamSize(SvStream * pStream) +sal_uInt64 GetSvStreamSize(SvStream * pStream) { - sal_uInt32 nCurPos = pStream->Tell(); + sal_uInt64 nCurPos = pStream->Tell(); pStream->Seek(STREAM_SEEK_TO_END); - sal_uInt32 ulLength = pStream->Tell(); + sal_uInt64 ulLength = pStream->Tell(); pStream->Seek(nCurPos); return ulLength; @@ -286,12 +286,12 @@ void LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *pObje std::unique_ptr<SvStream> xS(FindValueStreamWithPropertyName(sSName)); std::unique_ptr<SvStream> xD(FindValueStreamWithPropertyName(sDName)); - sal_uInt32 nDLen = 0; + sal_uInt64 nDLen = 0; if (xD) { nDLen = GetSvStreamSize(xD.get()); } - sal_uInt32 nLen = nDLen; + sal_uInt64 nLen = nDLen; if (xS) { nLen += GetSvStreamSize(xS.get()) ; @@ -310,13 +310,13 @@ void LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *pObje char * pPointer = pBuf; if (xD) { - xD->ReadBytes(pPointer, nDLen); + auto nRead = xD->ReadBytes(pPointer, nDLen); xD.reset(); } pPointer += nDLen; if (xS) { - xS->ReadBytes(pPointer, nLen - nDLen); + auto nRead = xS->ReadBytes(pPointer, nLen - nDLen); xS.reset(); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits