From 423505af348586c46792d2d89c05b8cb9e021928 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 7 Jul 2015 08:40:28 +0200 Subject: [PATCH 067/398] LOK: Corner case with working dir as '/'. Change-Id: I3965966f0d3fe65389e8834d67452ac56f9df2d6 (cherry picked from commit c4e74d50901eeaf979be4707815c1d3490b543ea) --- desktop/source/lib/init.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 &) { -- 2.12.0