diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-09-29 16:00:18 +0300 |
|---|---|---|
| committer | Dennis Francis <dennis.francis@collabora.co.uk> | 2017-11-21 13:49:51 +0530 |
| commit | 793a7e0ecb6d74b516bd314c9aec020381065efe (patch) | |
| tree | b55d1250e6a7ce4b2b9900ec2a9a697a7e8823aa /sc/source/core/data/document.cxx | |
| parent | 2fda62d190b78a7622fd7195a6a3574956e3b5a3 (diff) | |
Move nMacroInterpretLevel back to ScDocument
Change-Id: I48748434c845af963af160f8bbd75e4ab7ce95bd
Diffstat (limited to 'sc/source/core/data/document.cxx')
| -rw-r--r-- | sc/source/core/data/document.cxx | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 2df3f8e10a8b..1706342ccd36 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -6771,30 +6771,6 @@ ScMutationGuard::~ScMutationGuard() thread_local ScDocumentThreadSpecific ScDocument::maThreadSpecific; -sal_uInt16 ScDocument::GetMacroInterpretLevel() -{ - if (!mbThreadedGroupCalcInProgress) - return maNonThreaded.nMacroInterpretLevel; - else - return maThreadSpecific.nMacroInterpretLevel; -} - -void ScDocument::IncMacroInterpretLevel() -{ - if (!mbThreadedGroupCalcInProgress) - maNonThreaded.nMacroInterpretLevel++; - else - maThreadSpecific.nMacroInterpretLevel++; -} - -void ScDocument::DecMacroInterpretLevel() -{ - if (!mbThreadedGroupCalcInProgress) - maNonThreaded.nMacroInterpretLevel--; - else - maThreadSpecific.nMacroInterpretLevel--; -} - bool ScDocument::IsInInterpreterTableOp() const { if (!mbThreadedGroupCalcInProgress) @@ -6849,7 +6825,6 @@ ScRecursionHelper& ScDocument::GetRecursionHelper() void ScDocumentThreadSpecific::SetupFromNonThreadedData(const ScDocumentThreadSpecific& rNonThreadedData) { - nMacroInterpretLevel = rNonThreadedData.nMacroInterpretLevel; nInterpreterTableOpLevel = rNonThreadedData.nInterpreterTableOpLevel; // What about the recursion helper? @@ -6858,7 +6833,6 @@ void ScDocumentThreadSpecific::SetupFromNonThreadedData(const ScDocumentThreadSp void ScDocumentThreadSpecific::MergeBackIntoNonThreadedData(ScDocumentThreadSpecific& rNonThreadedData) { - assert(nMacroInterpretLevel == rNonThreadedData.nMacroInterpretLevel); assert(nInterpreterTableOpLevel == rNonThreadedData.nInterpreterTableOpLevel); // What about recursion helper and lookup cache? |