sc/source/filter/excel/xetable.cxx | 1 - 1 file changed, 1 deletion(-)
New commits: commit d98719b9f8e00996bc7bd8e3abeb6d4dd63d9a3e Author: Michael Meeks <michael.me...@collabora.com> Date: Wed Jan 21 15:17:05 2015 +0000 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.mohrh...@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index a8b719b..23adf6e 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(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits