From d739b01b9f20b1a7fd4b313b28e4dd4e5edd9193 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sat, 1 Mar 2014 19:25:38 +0100
Subject: Adapt rtl_uriConvertRelToAbs to RFC 3986

...which updates RFC 2396, removes the requirement that the base URI's path
starts with a slash, and clarifies how to treat excess "." and ".." segments.

This nicely allows handling of those odd vnd.sun.star.Package URLs as intended
now, so that making <foo> absolute relative to base URL
<vnd.sun.star.Package:Pictures/bar> yields <vnd.sun.star.Package:Pictures/foo>
instead of provoking a MalformedUriException.

Change-Id: Ice84303a57698a2c05d3a45541fe78b67450fa3c
---
 svgio/source/svgreader/svgimagenode.cxx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'svgio')

diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index e575502394dd..785136b51c5e 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -238,11 +238,7 @@ namespace svgio
                         try {
                             aAbsUrl = rtl::Uri::convertRelToAbs(rPath, maUrl);
                         } catch (rtl::MalformedUriException & e) {
-                            // Happens for the odd rPath =
-                            // "vnd.sun.star.Package:Pictures/..." scheme using
-                            // path components not starting with a slash by mis-
-                            // design:
-                            SAL_INFO(
+                            SAL_WARN(
                                 "svg",
                                 "caught rtl::MalformedUriException \""
                                     << e.getMessage() << "\"");
-- 
cgit v1.2.3