diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-10-04 16:55:59 +0300 |
|---|---|---|
| committer | Dennis Francis <dennis.francis@collabora.co.uk> | 2017-11-21 13:49:52 +0530 |
| commit | d07638341eade68eae61aa495cb5998c7102327a (patch) | |
| tree | 225358ed0462e25e591d9d8c814e553074050d41 | |
| parent | 6147ba802ac891910c7404c697b0e9f57f0a44d4 (diff) | |
Move ScDocument::GetNonThreadedContext() inline
Did not have any impact on performance, though.
Change-Id: I7e769b4a74e0ff9e0aabfb7e291fc4b987441954
| -rw-r--r-- | sc/inc/document.hxx | 6 | ||||
| -rw-r--r-- | sc/source/core/data/document.cxx | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index f37e8e7d856e..8b138378dda3 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -560,7 +560,11 @@ public: SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = nullptr ); - SC_DLLPUBLIC ScInterpreterContext GetNonThreadedContext() const; + ScInterpreterContext GetNonThreadedContext() const + { + // GetFormatTable() asserts that we are not in a threaded calculation + return ScInterpreterContext(*this, GetFormatTable()); + } SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager(); SC_DLLPUBLIC const sfx2::LinkManager* GetLinkManager() const; diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 0df71931c355..73f450dc8163 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -6769,13 +6769,6 @@ ScMutationGuard::~ScMutationGuard() #endif } -ScInterpreterContext ScDocument::GetNonThreadedContext() const -{ - // GetFormatTable() asserts that we are not in a threaded calculation - ScInterpreterContext aResult(*this, GetFormatTable()); - return aResult; -} - thread_local ScDocumentThreadSpecific ScDocument::maThreadSpecific; ScRecursionHelper& ScDocument::GetRecursionHelper() |