diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-01 19:25:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-01 19:28:15 +0100 |
| commit | d739b01b9f20b1a7fd4b313b28e4dd4e5edd9193 (patch) | |
| tree | 726ebc3307905cbd1ebb062e3fc1b14e785ff2d1 /svgio | |
| parent | 58f033569aedbeb2d6bc9d8e903b3f5a63c99614 (diff) | |
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
Diffstat (limited to 'svgio')
| -rw-r--r-- | svgio/source/svgreader/svgimagenode.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
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() << "\""); |