[Libreoffice-commits] core.git: sc/source

Michael Meeks michael.meeks at collabora.com
Sun Jan 25 09:46:18 PST 2015


 sc/source/filter/excel/xetable.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa943c3938e19ada039ddf63f3a0b2cfba3584b8
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Jan 21 15:17:05 2015 +0000

    Revert "Globally disable threading for these for now."
    
    This effctively 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: I85e61e5850bd8ff3288dac39de7699cd05dd4de8

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 807ea80..70f3373 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2065,7 +2065,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt
 
     GetProgressBar().ActivateFinalRowsSegment();
 
-#if 0
+#if 1
     // This is staggeringly slow, and each element operates only
     // on its own data.
     const size_t nRows = maRowMap.size();


More information about the Libreoffice-commits mailing list