package/source/zippackage/ZipPackageStream.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit da651b6ccb47e82f71d890fc8bb9d6cf0201f289
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Mar 25 21:35:55 2015 +0100
tdf#90010 Partially revert "package: Do not bother with deflating jpeg
images"
This reverts commit 0843ade74e5848c0babad509b10c334b01847be2 for the case,
when
the document is protected by password. Would be nice to fix properly later.
Change-Id: If159639d6f74de4e106e9dad382faac9d5de4a09
(cherry picked from commit ca5ff4559726455d0c8fbdd08cb35af3308492bf)
Reviewed-on: https://gerrit.libreoffice.org/15006
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index e22b234..c34ba01 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -775,7 +775,8 @@ 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
- if (xSeek.is() && msMediaType.endsWith("/jpeg"))
+ // Unfortunately, does not work for streams protected by password
+ if (xSeek.is() && msMediaType.endsWith("/jpeg") && !m_bToBeEncrypted)
{
ImplSetStoredData(*pTempEntry, xStream);
xSeek->seek(0);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
