summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-08-04 22:44:06 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-08-05 08:11:02 +0000
commit4fab83e1e12246a7183e5da090087ab65c0ccb3a (patch)
treebc3d6bab1bf5d340fa79f3ea62f997463efb9169
parentff7410fe4bc7518787afef5bd8a43760cb3d633c (diff)
wizards: FileAccess.getURL does not work on Windows
The hard-coded "/" separator causes getFileURLFromSystemPath to fail, and it's not obvious why the URL is being converted to a system path in the first place. Change-Id: I06ebe6d92954c4f3c884ae6f0b327ea8a36c10a4 (cherry picked from commit 8bf374b98d07c24a37933b8c03a53abb3a8ff5c6) Reviewed-on: https://gerrit.libreoffice.org/17512 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--wizards/com/sun/star/wizards/common/FileAccess.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py
index 0e67851d7640..7ff92c37790f 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -303,10 +303,12 @@ class FileAccess(object):
i += 1
return url
- def getURL(self, parentPath, childPath):
- parent = self.filenameConverter.getSystemPathFromFileURL(parentPath);
- path = parent + "/" + childPath
- return self.filenameConverter.getFileURLFromSystemPath(parentPath, path)
+ def getURL(self, parentURL, childPath):
+ if len(childPath) > 0 and childPath[0] == "/":
+ path = parentURL + childPath
+ else:
+ path = parentURL + "/" + childPath
+ return path
def getURL1(self, path):
f = "/"