diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-10-30 21:58:36 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-10-30 22:12:29 +0000 |
| commit | 593a44a12dbdc00a9f116efc754e3e17dff5dec6 (patch) | |
| tree | 821e63780edb644efcfe6a9f0ee6bb077b5f6fa5 /sc/source/filter | |
| parent | 62090f65b804a08a66ca26675ae610ed07c7c341 (diff) | |
thread-pool: re-work termination semantics to avoid problems.
We want a pre-spun-up, shared thread-pool that doesn't get its
workers created & joined frequently.
Change-Id: I29081e3a3e3849ca30e63fd080ee3315d99cbe8d
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/oox/workbookfragment.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 62ea5bb415e1..8488b46de7e5 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -336,8 +336,9 @@ void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVect // bar updating. Application::Yield(); } - // join all the threads: - aPool.waitUntilWorkersDone(); + aPool.waitUntilEmpty(); + + // threads joined in ThreadPool destructor } else // single threaded iteration { |