summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-08-07 12:58:01 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2019-08-07 17:42:05 +0200
commit74ec7d9dcd8e8d9189f3f77a2517f8e6355c6173 (patch)
tree18051b3d44aa7c36c0afe98c75df663eb634f708
parentProperly obtain location (diff)
downloadcore-distro/lhm/libreoffice-4-1-6+backports.tar.gz
core-distro/lhm/libreoffice-4-1-6+backports.zip
expand pyuno path separators distro/lhm/libreoffice-4-1-6+backports
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)
-rw-r--r--sfx2/source/doc/objmisc.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index d75bdc9b8cf7..1213855558ad 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1537,7 +1537,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;