diff options
| author | László Németh <nemeth@numbertext.org> | 2019-07-18 09:49:00 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-07-18 09:53:31 +0200 |
| commit | d91209f354163133eaaac0cf6e708f647d1aff17 (patch) | |
| tree | a84a0979dd9d79ab8756954260080e319ca47884 /writerfilter | |
| parent | bbb2a03f597d8602e4052c5a0f75edbf30d0b50f (diff) | |
Revert "tdf#123627 DOCX import: fix relative hyperlinks to documents"
This reverts commit 217a80fd205c7f61794c863898cb7cfd1a17e78f.
Change-Id: Ic6c9c68dff800f0969187bdd46b51f8e71c0c618
Reviewed-on: https://gerrit.libreoffice.org/75825
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index bcd341ae84ff..51b5c1e2cf96 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4500,7 +4500,7 @@ void DomainMapper_Impl::CloseFieldCommand() // Try to make absolute any relative URLs, except // for relative same-document URLs that only contain // a fragment part: - if (!sURL.startsWith("#")) { + if (!sURL.startsWith("#") && !m_aSaveOpt.IsSaveRelFSys()) { try { sURL = rtl::Uri::convertRelToAbs( m_aBaseUrl, sURL); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 5def87793773..040b8df0cc28 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/style/TabStop.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <unotools/saveopt.hxx> #include <queue> #include <stack> #include <tuple> @@ -406,6 +407,7 @@ public: private: SourceDocumentType const m_eDocumentType; DomainMapper& m_rDMapper; + SvtSaveOptions const m_aSaveOpt; OUString m_aBaseUrl; css::uno::Reference<css::text::XTextDocument> m_xTextDocument; css::uno::Reference<css::beans::XPropertySet> m_xDocumentSettings; |