summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-07-07 08:40:28 +0200
committerJan Holesovsky <kendy@collabora.com>2015-07-07 08:41:16 +0200
commitc4e74d50901eeaf979be4707815c1d3490b543ea (patch)
treea93a97a01ed5910b9d9ead16a6a7ad78db4d31a6 /desktop
parentf9663211b6a452b45242786eeed227c0779fba9b (diff)
LOK: Corner case with working dir as '/'.
Change-Id: I3965966f0d3fe65389e8834d67452ac56f9df2d6
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 63fe90b585b2..aa8e27c7f48f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -172,9 +172,11 @@ static OUString getAbsoluteURL(const char* pURL)
// convert relative paths to absolute ones
OUString aWorkingDir;
osl_getProcessWorkingDir(&aWorkingDir.pData);
+ if (!aWorkingDir.endsWith("/"))
+ aWorkingDir += "/";
try {
- return rtl::Uri::convertRelToAbs(aWorkingDir + "/", aURL);
+ return rtl::Uri::convertRelToAbs(aWorkingDir, aURL);
}
catch (const rtl::MalformedUriException &)
{