diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-07-09 18:44:42 +1000 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2019-07-10 15:05:18 +0200 |
commit | 97585591eea9fa7af20c051d2ffb95240ce3d8c6 (patch) | |
tree | 7cf1326b29365032a81c98a3f74b3866a50f747c /sc/source | |
parent | d4aa418fbfb9bd23e05fa739f20363bc299570d5 (diff) |
Postpone filter detection until link update is allowed
Change-Id: I85b2185e550f2a133ceb485241ef513b40593e34
Reviewed-on: https://gerrit.libreoffice.org/75301
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 03c708bf085f91480c014d7fa31e7a317b2c7b8f)
Reviewed-on: https://gerrit.libreoffice.org/75330
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 36b4aac3fc79..f53c93c3cf22 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2115,6 +2115,15 @@ void insertRefCellByIterator( } } +bool IsLinkUpdateAllowedInDoc(const ScDocument& rDoc) +{ + SfxObjectShell* pDocShell = rDoc.GetDocumentShell(); + if (!pDocShell) + return false; + + return pDocShell->GetEmbeddedObjectContainer().getUserAllowsLinkUpdate(); +} + } void ScExternalRefManager::insertRefCell(sal_uInt16 nFileId, const ScAddress& rCell) @@ -2322,13 +2331,8 @@ ScDocument* ScExternalRefManager::getInMemorySrcDocument(sal_uInt16 nFileId) return nullptr; // Do not load document until it was allowed - SfxObjectShell* pDocShell = mpDoc->GetDocumentShell(); - if ( pDocShell ) - { - const comphelper::EmbeddedObjectContainer& rContainer = pDocShell->GetEmbeddedObjectContainer(); - if ( !rContainer.getUserAllowsLinkUpdate() ) - return nullptr; - } + if (!IsLinkUpdateAllowedInDoc(*mpDoc)) + return nullptr; ScDocument* pSrcDoc = nullptr; ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>, false)); @@ -2573,6 +2577,11 @@ void ScExternalRefManager::maybeLinkExternalFile( sal_uInt16 nFileId, bool bDefe aFilter = pFileData->maFilterName; aOptions = pFileData->maFilterOptions; } + + // Filter detection may access external links; defer it until we are allowed + if (!bDeferFilterDetection) + bDeferFilterDetection = !IsLinkUpdateAllowedInDoc(*mpDoc); + // If a filter was already set (for example, loading the cached table), // don't call GetFilterName which has to access the source file. // If filter detection is deferred, the next successful loadSrcDocument() |