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

[Michael Meeks]

 sc/source/filter/oox/workbookfragment.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 80d6fd81dd8aff8f864049240eff71273bdd3e89
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Sep 12 16:19:18 2014 +0100

    sc: enable threaded sheet loading un-conditionally.
    
    Previous this was experimental only.
    
    Change-Id: Ie5923e5342e7bace7492d561ce80ac86f69ec06c

diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index d7ffaab..1ce4376 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -300,10 +300,6 @@ void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVect
 
     Reference< XComponentContext > xContext = comphelper::getProcessComponentContext();
 
-    // Force threading off unless experimental mode or env. var is set.
-    if( !officecfg::Office::Common::Misc::ExperimentalMode::get( xContext ) )
-        nThreads = 0;
-
     const char *pEnv;
     if( ( pEnv = getenv( "SC_IMPORT_THREADS" ) ) )
         nThreads = rtl_str_toInt32( pEnv, 10 );
@@ -340,7 +336,7 @@ void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVect
         // join all the threads:
         aPool.waitUntilWorkersDone();
     }
-    else
+    else // single threaded iteration
     {
         SheetFragmentVector::iterator it = rSheets.begin(), itEnd = rSheets.end();
         for( ; it != itEnd; ++it )