diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-07-26 00:23:50 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-07-26 00:23:50 -0500 |
| commit | 33a21d37f376abaaabdaceaa09160cab962038fc (patch) | |
| tree | a5716c31d385c37401408efeaba95adf64be9056 /package/inc | |
| parent | 11f24bc2f032b31095663cb09ef948eee2c61f49 (diff) | |
Revert "Resolves: tdf#88314 close temp file after each thread completes"
This reverts commit 738cf411e9315d17c7eb8be47ded643a00dfe5c5.
It brokes windows in https://gerrit.libreoffice.org/#/c/17289/
as per http://ci.libreoffice.org/job/lo_gerrit_master/4465/Gerrit=Gerrit,Platform=Windows/
was pushed despite that.. :-(
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/ZipOutputEntry.hxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx index d8d0ee65c6a6..2a5aa0483ce8 100644 --- a/package/inc/ZipOutputEntry.hxx +++ b/package/inc/ZipOutputEntry.hxx @@ -37,8 +37,7 @@ class ZipOutputEntry { ::com::sun::star::uno::Sequence< sal_Int8 > m_aDeflateBuffer; ZipUtils::Deflater m_aDeflater; - css::uno::Reference< css::uno::XComponentContext > m_xContext; - OUString m_aTempURL; + css::uno::Reference< css::io::XTempFile > m_xTempFile; css::uno::Reference< css::io::XOutputStream > m_xOutStream; ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext; @@ -59,18 +58,14 @@ public: ~ZipOutputEntry(); - /* This block of methods is for threaded zipping, where we compress to a temp stream, whose - data is retrieved via getData */ - void createBufferFile(); - void setParallelDeflateException(const ::css::uno::Any &rAny) { m_aParallelDeflateException = rAny; } - css::uno::Reference< css::io::XInputStream > getData() const; - ::css::uno::Any getParallelDeflateException() const { return m_aParallelDeflateException; } - void closeBufferFile(); - + css::uno::Reference< css::io::XInputStream > getData(); ZipEntry* getZipEntry() { return m_pCurrentEntry; } ZipPackageStream* getZipPackageStream() { return m_pCurrentStream; } bool isEncrypt() { return m_bEncryptCurrentEntry; } + void setParallelDeflateException(const ::css::uno::Any &rAny) { m_aParallelDeflateException = rAny; } + ::css::uno::Any getParallelDeflateException() const { return m_aParallelDeflateException; } + void closeEntry(); void write(const css::uno::Sequence< sal_Int8 >& rBuffer); |