[Libreoffice-commits] core.git: desktop/source

[Jan Holesovsky]

 desktop/source/lib/init.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c4e74d50901eeaf979be4707815c1d3490b543ea
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Jul 7 08:40:28 2015 +0200

    LOK: Corner case with working dir as '/'.
    
    Change-Id: I3965966f0d3fe65389e8834d67452ac56f9df2d6

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 63fe90b..aa8e27c 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 &)
     {