summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorTünde Tóth <tundeth@gmail.com>2019-07-30 09:29:24 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-08-01 10:24:21 +0200
commita912df26c6bd9251802f853775753d20f3b3de2b (patch)
tree2135f60bc8556607da60c9e9661439266d496743 /writerfilter
parent97185d833c8dc75032ff73cbf597635b32c5f5fb (diff)
tdf#126590 DOCX import: fix absolute hyperlinks to documents
Absolute links in DOCX documents created with Word didn't work. Change-Id: Ie23c9ded1c88752768b925ec26df3061beeddd8e Reviewed-on: https://gerrit.libreoffice.org/76581 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 215a5c6f0c65..7e42d4af1233 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4511,10 +4511,16 @@ void DomainMapper_Impl::CloseFieldCommand()
if (!sURL.isEmpty())
{
+ if (sURL.startsWith("file:///"))
+ {
+ // file:///absolute\path\to\file => invalid file URI (Writer cannot open)
+ // convert all blackslashes to slashes:
+ sURL = sURL.replace('\\', '/');
+ }
// Try to make absolute any relative URLs, except
// for relative same-document URLs that only contain
// a fragment part:
- if (!sURL.startsWith("#")) {
+ else if (!sURL.startsWith("#")) {
try {
sURL = rtl::Uri::convertRelToAbs(
m_aBaseUrl, sURL);