diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-09-12 16:19:18 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-09-12 22:04:38 +0100 |
| commit | 80d6fd81dd8aff8f864049240eff71273bdd3e89 (patch) | |
| tree | 3e1e4c39e012d6e43301ac987da6c351fcd325ef /sc | |
| parent | 57d7802145befa4ebc191cc646069aefb58f5c32 (diff) | |
sc: enable threaded sheet loading un-conditionally.
Previous this was experimental only.
Change-Id: Ie5923e5342e7bace7492d561ce80ac86f69ec06c
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/oox/workbookfragment.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index d7ffaab6706d..1ce43769dfa5 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 ) |