From 8bf374b98d07c24a37933b8c03a53abb3a8ff5c6 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 4 Aug 2015 22:44:06 +0200 Subject: 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 --- wizards/com/sun/star/wizards/common/FileAccess.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'wizards') 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 = "/" -- cgit