diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-05-24 22:05:30 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-05-28 12:27:48 +0200 |
| commit | 7cd3f267cfbf3655f6a7a395b80560ecd22e15f7 (patch) | |
| tree | e14173cddc4e4fb5b0709a7ae64d90316da0b76a /package/inc/ZipOutputStream.hxx | |
| parent | ee22409ab6187d3545db71d255ec3866262baa6e (diff) | |
split out thread functionality from ZipOutputEntry
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 <l.lunak@collabora.com>
Diffstat (limited to 'package/inc/ZipOutputStream.hxx')
| -rw-r--r-- | package/inc/ZipOutputStream.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
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<comphelper::ThreadTask> pThreadTask ); + void addDeflatingThreadTask( ZipOutputEntryInThread *pEntry, std::unique_ptr<comphelper::ThreadTask> 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<ZipOutputEntry> pCandidate); + void consumeScheduledThreadTaskEntry(std::unique_ptr<ZipOutputEntryInThread> pCandidate); void consumeFinishedScheduledThreadTaskEntries(); public: |