From a912df26c6bd9251802f853775753d20f3b3de2b Mon Sep 17 00:00:00 2001 From: Tünde Tóth Date: Tue, 30 Jul 2019 09:29:24 +0200 Subject: 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 --- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'writerfilter') 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); -- cgit v1.2.3