summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-02-26 14:29:24 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-02-26 21:15:57 +0100
commit1663b1e8233db6c6d1c2b35639ad984961084009 (patch)
treea478f762fba5b920918fa03ce1631dc871762661
parentea58b039ab455b38aabbd20e8e50ec8965a1d69d (diff)
tdf#120736: For Calc shared documents also check the original document URL
...as instead of the original shared document, a temporary copy (with a file URL denoting a temporary directory, like <file:///tmp/lulmhoxl.tmp/0.ods>) is opened in that case. Change-Id: I415f5a0ec44ee06f7ca98495f0e8f032ba93e05c Reviewed-on: https://gerrit.libreoffice.org/68391 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--sc/source/ui/docshell/docsh4.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 0c73fb1c682c..b382bd81e29a 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -470,7 +470,10 @@ void ScDocShell::Execute( SfxRequest& rReq )
&& !(SvtSecurityOptions()
.isTrustedLocationUriForUpdatingLinks(
GetMedium() == nullptr
- ? OUString() : GetMedium()->GetName())))
+ ? OUString() : GetMedium()->GetName())
+ || (IsDocShared()
+ && SvtSecurityOptions().isTrustedLocationUriForUpdatingLinks(
+ GetSharedFileURL()))))
{
nSet = LM_ON_DEMAND;
}