diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-15 09:11:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-15 19:25:53 +0200 |
| commit | 076fa17b5c04dc7afe593132c00ad9e57dd486f8 (patch) | |
| tree | 7ea4be4a92337d196a57f9ec7dc32445351aba17 /package | |
| parent | 4cc702a7055c0e12c7cbf5e5e359e7cbc8b88020 (diff) | |
loplugin:buriedassign in l,o,p*
Change-Id: Ib2dd157d43c4387eda009475311761fe2eb627cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92241
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zipapi/XUnbufferedStream.cxx | 7 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackageEntry.cxx | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index 4539829f20f0..c4bebeeb83da 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -223,11 +223,12 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa } else { - while ( 0 == ( nLastRead = maInflater.doInflateSegment( aData, nRead, aData.getLength() - nRead ) ) || - ( nRead + nLastRead != nRequestedBytes && mnZipCurrent < mnZipEnd ) ) + for (;;) { + nLastRead = maInflater.doInflateSegment( aData, nRead, aData.getLength() - nRead ); + if ( 0 != nLastRead && ( nRead + nLastRead == nRequestedBytes || mnZipCurrent >= mnZipEnd ) ) + break; nRead += nLastRead; - if ( nRead > nRequestedBytes ) throw RuntimeException( "Should not be possible to read more than requested!" ); diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx index 35789653b35d..86b4906711bd 100644 --- a/package/source/zippackage/ZipPackageEntry.cxx +++ b/package/source/zippackage/ZipPackageEntry.cxx @@ -92,9 +92,11 @@ void ZipPackageEntry::doSetParent ( ZipPackageFolder * pNewParent ) void SAL_CALL ZipPackageEntry::setParent( const uno::Reference< XInterface >& xNewParent ) { - sal_Int64 nTest(0); + if ( !xNewParent.is() ) + throw NoSupportException(THROW_WHERE ); uno::Reference < XUnoTunnel > xTunnel ( xNewParent, UNO_QUERY ); - if ( !xNewParent.is() || ( nTest = xTunnel->getSomething ( ZipPackageFolder::getUnoTunnelId () ) ) == 0 ) + sal_Int64 nTest = xTunnel->getSomething ( ZipPackageFolder::getUnoTunnelId () ); + if ( nTest == 0 ) throw NoSupportException(THROW_WHERE ); ZipPackageFolder *pNewParent = reinterpret_cast < ZipPackageFolder * > ( nTest ); |