From 7cd3f267cfbf3655f6a7a395b80560ecd22e15f7 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 24 May 2019 22:05:30 +0200 Subject: split out thread functionality from ZipOutputEntry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It can be easily separated out, it looked like hacked in. And I will need to do more refactoring of the class, so this shouldn't be more complex than necessary. Change-Id: I302da55409e9195274907ca4939c37fbb2427b18 Reviewed-on: https://gerrit.libreoffice.org/73031 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- package/inc/ZipOutputStream.hxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package/inc/ZipOutputStream.hxx') diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index ff7b66d64507..b527abde1443 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -29,6 +29,7 @@ struct ZipEntry; class ZipOutputEntry; +class ZipOutputEntryInThread; class ZipPackageStream; class ZipOutputStream @@ -39,7 +40,7 @@ class ZipOutputStream ByteChucker m_aChucker; ZipEntry *m_pCurrentEntry; - std::vector< ZipOutputEntry* > m_aEntries; + std::vector< ZipOutputEntryInThread* > m_aEntries; std::exception_ptr m_aDeflateException; public: @@ -47,7 +48,7 @@ public: const css::uno::Reference< css::io::XOutputStream > &xOStream ); ~ZipOutputStream(); - void addDeflatingThreadTask( ZipOutputEntry *pEntry, std::unique_ptr pThreadTask ); + void addDeflatingThreadTask( ZipOutputEntryInThread *pEntry, std::unique_ptr pThreadTask ); /// @throws css::io::IOException /// @throws css::uno::RuntimeException @@ -79,7 +80,7 @@ private: void writeEXT( const ZipEntry &rEntry ); // ScheduledThread handling helpers - void consumeScheduledThreadTaskEntry(std::unique_ptr pCandidate); + void consumeScheduledThreadTaskEntry(std::unique_ptr pCandidate); void consumeFinishedScheduledThreadTaskEntries(); public: -- cgit