LOK: Corner case with working dir as '/'.

Change-Id: I3965966f0d3fe65389e8834d67452ac56f9df2d6

LOK: Corner case with working dir as '/'.
Change-Id: I3965966f0d3fe65389e8834d67452ac56f9df2d6
c4e74d50 · Jan Holesovsky · f9663211 · c4e74d50
Kaydet (Commit) c4e74d50 authored Tem 07, 2015 tarafından Jan Holesovsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

init.cxx desktop/source/lib/init.cxx +3 -1

No files found.
--- 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 &)
    {