[Libreoffice-commits] core.git: sc/source

[Libreoffice Gerrit user]

 sc/source/ui/docshell/docsh4.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1663b1e8233db6c6d1c2b35639ad984961084009
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Feb 26 14:29:24 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Feb 26 21:15:57 2019 +0100

    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 at redhat.com>

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;
                 }