package/source/zippackage/ZipPackageStream.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit f8fdc6417b4d023b7c75485754a0ab1b164a69d6 Author: Xisco Fauli <aniste...@gmail.com> Date: Wed Apr 19 11:38:59 2017 +0200 tdf#105942 Don't hang when file is protected and compressed Change-Id: I762e6e6d457ea3f5a1f1fd706268b832a71ee550 Reviewed-on: https://gerrit.libreoffice.org/36672 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Xisco Faulà <xiscofa...@libreoffice.org> diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 15477a3a2099..14637f9f18ca 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -784,7 +784,7 @@ bool ZipPackageStream::saveChild( uno::Reference< io::XSeekable > xSeek(xStream, uno::UNO_QUERY); // It's not worth to deflate jpegs to save ~1% in a slow process // Unfortunately, does not work for streams protected by password - if (xSeek.is() && msMediaType.endsWith("/jpeg") && !m_bToBeEncrypted) + if (xSeek.is() && msMediaType.endsWith("/jpeg") && !m_bToBeEncrypted && !m_bToBeCompressed) { ImplSetStoredData(*pTempEntry, xStream); xSeek->seek(0);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits