From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 7 Aug 2019 11:58:01 +0000 (+0100)
Subject: expand pyuno path separators
X-Git-Tag: archive/raspbian/1%5.2.7-1+rpi1+deb9u11^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c15fd1e5ed1f88f306dd16b0350eb1aff7a920bb;p=libreoffice.git

expand pyuno path separators

Change-Id: Ic97649ed6d4be595b308922c7bdc880cbb60b239
Reviewed-on: https://gerrit.libreoffice.org/77102
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 75903a0298218f89a199a5ac151ee0166f4469d7)
Reviewed-on: https://gerrit.libreoffice.org/77116

Gbp-Pq: Name expand-pyuno-path-separators.diff
---

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 336a56c307e..d9203abc5f9 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1477,7 +1477,8 @@ bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL)
     if (!sfUri.is())
         return false;
 
-    OUString sScript = sfUri->getName();
+    // pyuno encodes path separator as |
+    OUString sScript = sfUri->getName().replace('|', '/');
 
     // check if any path portion matches LibreLogo and ban it if it does
     sal_Int32 nIndex = 0;