From fbf714b45625c50bb1c736ef231b5dbbab0016a1 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 21 Oct 2014 15:17:13 +0200 Subject: package: Finally implement parallel zip entries deflating For that: 1, create ZipPackageStream::successfullyWritten to be called after the content is written 2, Do not take mutex when reading from WrapStreamForShare - threads should be using different streams anyway, but there is only one common mutex. :-/ Change-Id: I90303e49206b19454dd4141e24cc8be29c433045 --- package/inc/ZipPackageStream.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/inc/ZipPackageStream.hxx') diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index 356d42b78f11..ff6d3db1f6f9 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -63,14 +63,13 @@ private: sal_uInt8 m_nStreamMode; sal_uInt32 m_nMagicalHackPos; sal_uInt32 m_nMagicalHackSize; + sal_Int64 m_nOwnStreamOrigSize; bool m_bHasSeekable; - bool m_bCompressedIsSetFromOutside; - bool m_bFromManifest; - bool m_bUseWinEncoding; + bool m_bRawStream; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetOwnSeekStream(); @@ -138,6 +137,7 @@ public: void setZipEntryOnLoading( const ZipEntry &rInEntry); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawData() throw(::com::sun::star::uno::RuntimeException); + void successfullyWritten( ZipEntry *pEntry ); static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId(); -- cgit