From f8fdc6417b4d023b7c75485754a0ab1b164a69d6 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Wed, 19 Apr 2017 11:38:59 +0200 Subject: tdf#105942 Don't hang when file is protected and compressed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I762e6e6d457ea3f5a1f1fd706268b832a71ee550 Reviewed-on: https://gerrit.libreoffice.org/36672 Tested-by: Jenkins Reviewed-by: Xisco Faulí --- package/source/zippackage/ZipPackageStream.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3