comphelper/source/streaming/oslfile2streamwrap.cxx | 11 ++++------- desktop/source/app/opencl.cxx | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-)
New commits: commit d0feba06767cfa3adce2db8d6bc87bc969418d28 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jul 18 10:58:05 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jul 19 09:40:59 2019 +0200 cid#1448429 Unchecked return value Change-Id: Iddbd6bc2126943752e2057b749fd6f9943261be7 Reviewed-on: https://gerrit.libreoffice.org/75888 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index c69473a60943..14441d61f76f 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -66,7 +66,6 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 return sal::static_int_cast< sal_Int32 >(nRead); } - sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) { if (!m_pFile) @@ -78,7 +77,6 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_ return readBytes(aData, nMaxBytesToRead); } - void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -86,17 +84,16 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); sal_uInt64 nCurrentPos; - m_pFile->getPos(nCurrentPos); + FileBase::RC eError = m_pFile->getPos(nCurrentPos); + if (eError != FileBase::E_None) + throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); sal_uInt64 nNewPos = nCurrentPos + nBytesToSkip; - FileBase::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos); + eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos); if (eError != FileBase::E_None) - { throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); - } } - sal_Int32 SAL_CALL OSLInputStreamWrapper::available() { ::osl::MutexGuard aGuard( m_aMutex ); commit 5419243c06b12d04af765f92121a5cae7d4305fd Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jul 18 10:33:12 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jul 19 09:40:43 2019 +0200 cid#1448295 Unchecked return value Change-Id: I4b0dd4fc9051f04448a651cb87b449a58d2a5349 Reviewed-on: https://gerrit.libreoffice.org/75874 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx index c421a3ab66da..6e90d6b71282 100644 --- a/desktop/source/app/opencl.cxx +++ b/desktop/source/app/opencl.cxx @@ -217,7 +217,7 @@ void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop) rtl::Bootstrap::expandMacros(aURL); DirectoryItem aItem; - DirectoryItem::get( aURL, aItem ); + (void)DirectoryItem::get( aURL, aItem ); FileStatus aFileStatus( osl_FileStatus_Mask_ModifyTime ); (void)aItem.getFileStatus( aFileStatus ); TimeValue aTimeVal = aFileStatus.getModifyTime(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
