summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-04-21 21:14:50 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-05-19 03:43:29 +0200
commit9304180abff7f213ce30d6c2ad31d5d8e8d455e7 (patch)
tree673889d7956f9b0eeaa098ed8fb3697189c55121 /desktop
parentbdeb0c7f2a073fbd5ec0d9d9ed3ab1f3236c704c (diff)
first stab at normalizing updater path
Change-Id: I5ef2253068595c41577330395810b0797eff8cbb
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/updater.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index f31f2800dc4b..07f24b48378f 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -54,6 +54,10 @@ const char* pSofficeExeName = "soffice.exe";
#error "Need implementation"
#endif
+OUString normalizePath(const OUString& rPath)
+{
+ return rPath.replaceAll("//", "/");
+}
void CopyFileToDir(const OUString& rTempDirURL, const OUString rFileName, const OUString& rOldDir)
{
@@ -73,7 +77,7 @@ OUString getPathFromURL(const OUString& rURL)
OUString aPath;
osl::FileBase::getSystemPathFromFileURL(rURL, aPath);
- return aPath;
+ return normalizePath(aPath);
}
void CopyUpdaterToTempDir(const OUString& rInstallDirURL, const OUString& rTempDirURL)