desktop/source/lib/init.cxx | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
New commits: commit b183507ee293d8bcafa9c1c5b2844b7a83fea17b Author: Jan Holesovsky <ke...@collabora.com> Date: Mon Jul 6 15:16:56 2015 +0200 LOK: Cleanup absolutizing of URLs. Thanks to Stephan Bergmann. Change-Id: I22aa3bb827db28bce3eabebb9b8c514663fad860 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 3a0ce67..63fe90b 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -26,8 +26,9 @@ #include <osl/file.hxx> #include <osl/process.h> #include <osl/thread.h> -#include <rtl/strbuf.hxx> #include <rtl/bootstrap.hxx> +#include <rtl/strbuf.hxx> +#include <rtl/uri.hxx> #include <cppuhelper/bootstrap.hxx> #include <comphelper/dispatchcommand.hxx> #include <comphelper/lok.hxx> @@ -165,19 +166,21 @@ static OUString getUString(const char* pString) static OUString getAbsoluteURL(const char* pURL) { OUString aURL(getUString(pURL)); - - // return unchanged if it likely is an URL already - if (aURL.indexOf("://") > 0) + if (aURL.isEmpty()) return aURL; - OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl; - // convert relative paths to absolute ones - osl_getProcessWorkingDir(&sWorkingDir.pData); - osl::FileBase::getFileURLFromSystemPath( aURL, sDocPathUrl ); - osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl, sAbsoluteDocUrl); + OUString aWorkingDir; + osl_getProcessWorkingDir(&aWorkingDir.pData); + + try { + return rtl::Uri::convertRelToAbs(aWorkingDir + "/", aURL); + } + catch (const rtl::MalformedUriException &) + { + } - return sAbsoluteDocUrl; + return OUString(); } extern "C" @@ -349,6 +352,12 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis, SolarMutexGuard aGuard; OUString aURL(getAbsoluteURL(pURL)); + if (aURL.isEmpty()) + { + pLib->maLastExceptionMsg = "Filename to load was not provided."; + SAL_INFO("lok", "URL for load is empty"); + return NULL; + } pLib->maLastExceptionMsg.clear(); @@ -415,6 +424,12 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha OUString sFormat = getUString(pFormat); OUString aURL(getAbsoluteURL(sUrl)); + if (aURL.isEmpty()) + { + gImpl->maLastExceptionMsg = "Filename to save to was not provided."; + SAL_INFO("lok", "URL for save is empty"); + return false; + } try { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits