summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-01-21 15:17:05 +0000
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-01-21 17:35:07 +0000
commitd98719b9f8e00996bc7bd8e3abeb6d4dd63d9a3e (patch)
treec46276328d2c132f8bd8b06bb82e387dfbe8eea3
parentd5ff2e409d450d53ab0bed7cdc3de18841c5c7fb (diff)
Revert "Globally disable threading for these for now."
This reverts commit d677bf455f08264096edd13e3306c55f74f7ee1d. It appears that the memory corruption was an out-of-memory condition on 32bit Windows, so restore XclExpRow threading for now. Change-Id: If8ca6640a3bc6196106426bd0477d48c556036e7 Reviewed-on: https://gerrit.libreoffice.org/14091 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--sc/source/filter/excel/xetable.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index a8b719b5cce0..23adf6e3f0db 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2069,7 +2069,6 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt
// on its own data.
size_t nRows = maRowMap.size();
size_t nThreads = std::max( std::thread::hardware_concurrency(), 1U );
- nThreads = 1; // globally disable multi-threading for now.
if ( nThreads == 1 || nRows < 128 )
{
RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd = maRowMap.end();