diff options
Diffstat (limited to 'sc/source/core')
-rw-r--r-- | sc/source/core/data/documen2.cxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/document.cxx | 40 |
2 files changed, 1 insertions, 40 deletions
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 9fab88f4e910..283c082199b2 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -176,6 +176,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : nXMLImportedFormulaCount( 0 ), nInterpretLevel(0), nMacroInterpretLevel(0), + nInterpreterTableOpLevel(0), nSrcVer( SC_CURRENT_VERSION ), nFormulaTrackCount(0), eHardRecalcState(HardRecalcState::OFF), diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 1706342ccd36..185115ac8ad7 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -6771,42 +6771,6 @@ ScMutationGuard::~ScMutationGuard() thread_local ScDocumentThreadSpecific ScDocument::maThreadSpecific; -bool ScDocument::IsInInterpreterTableOp() const -{ - if (!mbThreadedGroupCalcInProgress) - return maNonThreaded.nInterpreterTableOpLevel != 0; - else - return maThreadSpecific.nInterpreterTableOpLevel != 0; -} - -void ScDocument::IncInterpreterTableOpLevel() -{ - if (!mbThreadedGroupCalcInProgress) - { - if (maNonThreaded.nInterpreterTableOpLevel < USHRT_MAX) - maNonThreaded.nInterpreterTableOpLevel++; - } - else - { - if (maThreadSpecific.nInterpreterTableOpLevel < USHRT_MAX) - maThreadSpecific.nInterpreterTableOpLevel++; - } -} - -void ScDocument::DecInterpreterTableOpLevel() -{ - if (!mbThreadedGroupCalcInProgress) - { - if (maNonThreaded.nInterpreterTableOpLevel) - maNonThreaded.nInterpreterTableOpLevel--; - } - else - { - if (maThreadSpecific.nInterpreterTableOpLevel) - maThreadSpecific.nInterpreterTableOpLevel--; - } -} - ScRecursionHelper& ScDocument::GetRecursionHelper() { if (!mbThreadedGroupCalcInProgress) @@ -6825,16 +6789,12 @@ ScRecursionHelper& ScDocument::GetRecursionHelper() void ScDocumentThreadSpecific::SetupFromNonThreadedData(const ScDocumentThreadSpecific& rNonThreadedData) { - nInterpreterTableOpLevel = rNonThreadedData.nInterpreterTableOpLevel; - // What about the recursion helper? // Copy the lookup cache? } void ScDocumentThreadSpecific::MergeBackIntoNonThreadedData(ScDocumentThreadSpecific& rNonThreadedData) { - assert(nInterpreterTableOpLevel == rNonThreadedData.nInterpreterTableOpLevel); - // What about recursion helper and lookup cache? } |