diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-15 19:08:08 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-16 11:06:33 +0200 |
| commit | 03b55edc3e7ca0fc3ff842e6ca1f4e7477a4d6a2 (patch) | |
| tree | 34a2e7adb313949fbef1dad80a5226746ffc5037 /sc | |
| parent | bc9a2ba677ce3fcd46c2bbef6e8faeacb14292c1 (diff) | |
external data: add the deterministic mode also for html
Change-Id: If253b2ff2b4f38ba45a2be7f66dfbcb65ed9be74
Reviewed-on: https://gerrit.libreoffice.org/41196
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/dataprovider/htmldataprovider.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sc/source/ui/dataprovider/htmldataprovider.cxx b/sc/source/ui/dataprovider/htmldataprovider.cxx index 4353d59e0364..61160c07d309 100644 --- a/sc/source/ui/dataprovider/htmldataprovider.cxx +++ b/sc/source/ui/dataprovider/htmldataprovider.cxx @@ -215,6 +215,7 @@ HTMLDataProvider::~HTMLDataProvider() { if (mxHTMLFetchThread.is()) { + SolarMutexReleaser aReleaser; mxHTMLFetchThread->join(); } } @@ -229,6 +230,12 @@ void HTMLDataProvider::Import() mpDoc->ResetClip(mpDocument, (SCTAB)0); mxHTMLFetchThread = new HTMLFetchThread(*mpDoc, maURL, maID, &maIdle); mxHTMLFetchThread->launch(); + + if (mbDeterministic) + { + SolarMutexReleaser aReleaser; + mxHTMLFetchThread->join(); + } } IMPL_LINK_NOARG(HTMLDataProvider, ImportFinishedHdl, Timer*, void) |