From: Stephan Bergmann <sbergman@redhat.com>
Date: Sat, 3 Aug 2019 15:37:48 +0000 (+0100)
Subject: keep name percent-encoded
X-Git-Tag: archive/raspbian/1%5.2.7-1+rpi1+deb9u10^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6cbec072053d925b4a2f396cf5e5d033a28b12e9;p=libreoffice.git

keep name percent-encoded

Change-Id: I470c4b24192c3e3c9b556a9bbb3b084359e0033b
Reviewed-on: https://gerrit.libreoffice.org/77008
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

Gbp-Pq: Name keep-name-percent-encoded.diff
---

diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
index 9609b6d9464..6625b226f60 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -218,7 +218,9 @@ class MyUriHelper:
 
             # path to the .py file + "$functionname, arguments, etc
             xStorageUri = self.m_uriRefFac.parse(scriptURI)
-            sStorageUri = xStorageUri.getName().replace( "|", "/" );
+            # getName will apply url-decoding to the name, so encode back
+            sStorageUri = xStorageUri.getName().replace("%", "%25")
+            sStorageUri = sStorageUri.replace( "|", "/" )
 
             # path to the .py file, relative to the base
             sFileUri = sStorageUri[0:sStorageUri.find("$")]