diff options
author | Dennis Francis <dennis.francis@collabora.com> | 2019-02-05 16:55:08 +0530 |
---|---|---|
committer | Dennis Francis <dennis.francis@collabora.com> | 2019-02-11 10:54:08 +0100 |
commit | 4aea832ffebefd62e5f9a3b34dca493b21a16bb0 (patch) | |
tree | f5cc1a40fbf6dae1b8658796ca05c10b7161888d /sc/source/ui/docshell/docsh4.cxx | |
parent | c04eb27affb8f6284d01dbd9f8b3c92a7979087a (diff) |
tdf#121388 : Disable threading and dep evaluation for IF...
IFS/SWITCH if the call did not originate from
ScDocShell::DoRecalc()/ScDocShell::DoHardRecalc()
Change-Id: Ifdb3a496276dc841fc42a1bad1876cfb1057baf6
Reviewed-on: https://gerrit.libreoffice.org/67414
Tested-by: Jenkins
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
Diffstat (limited to 'sc/source/ui/docshell/docsh4.cxx')
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 83ccac2c5c3f..4fba1567e8bc 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1329,6 +1329,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( bool bJustQueryIfProtected ) void ScDocShell::DoRecalc( bool bApi ) { + ScDocShellRecalcGuard aGuard(m_aDocument); bool bDone = false; ScTabViewShell* pSh = GetBestViewShell(); ScInputHandler* pHdl = ( pSh ? SC_MOD()->GetInputHdl( pSh ) : nullptr ); @@ -1375,6 +1376,7 @@ void ScDocShell::DoRecalc( bool bApi ) void ScDocShell::DoHardRecalc() { auto start = std::chrono::steady_clock::now(); + ScDocShellRecalcGuard aGuard(m_aDocument); WaitObject aWaitObj( GetActiveDialogParent() ); ScTabViewShell* pSh = GetBestViewShell(); if ( pSh ) |