summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-09-07 15:47:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-09-08 08:45:41 +0200
commit7764ae70b04058a64a3999529e98d1115ba59d1c (patch)
tree23a78251b97610b7a948ef776dfbcbc48aefbd8d /package
parent37d5bf82eae7e6d611879d1132b1f6fdafdeb9ed (diff)
clang bugprone-unused-return-value
most of these changes just make the change of ownership when using std::unique_ptr clearer, but there is one definite leak fix in PlainTextFilterDetect::detect Change-Id: I8282a68007222a4fee84004f394bde0cca8569e9 Reviewed-on: https://gerrit.libreoffice.org/60159 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 5fe4d0ef80c5..5e62b8bf1aff 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -727,10 +727,9 @@ bool ZipPackageStream::saveChild(
if ( m_bRawStream )
xStream->skipBytes( m_nMagicalHackPos );
- ZipOutputStream::setEntry(pTempEntry);
- rZipOut.writeLOC(pTempEntry);
// the entry is provided to the ZipOutputStream that will delete it
- pAutoTempEntry.release();
+ ZipOutputStream::setEntry(pAutoTempEntry.release());
+ rZipOut.writeLOC(pTempEntry);
uno::Sequence < sal_Int8 > aSeq ( n_ConstBufferSize );
sal_Int32 nLength;
@@ -797,9 +796,8 @@ bool ZipPackageStream::saveChild(
try
{
- ZipOutputStream::setEntry(pTempEntry);
// the entry is provided to the ZipOutputStream that will delete it
- pAutoTempEntry.release();
+ ZipOutputStream::setEntry(pAutoTempEntry.release());
if (pTempEntry->nMethod == STORED)
{