diff options
| author | Tünde Tóth <tundeth@gmail.com> | 2019-07-18 15:10:26 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-07-25 09:31:34 +0200 |
| commit | 4c30848c852c44cbad8509c770feed5244f1940f (patch) | |
| tree | 615ac395cd879b014b573c5e0adec165f13eff1f /writerfilter | |
| parent | 6cb3b009fc4e73cc0ea07d166c274f05306b0e75 (diff) | |
tdf#123627 DOCX import: fix relative hyperlinks to documents
Revert "tdf#86087 DOCX Import link as relative if preferred"
This reverts commit 40acf8d6447065077acba9e800c56239f58c8262.
Relative urls aren't converted to absolute urls, if the
"Save URLs relative to filesystem" setting is checked.
Change-Id: I209fa57e508dd425772e0019c1749a2bdc92e3ed
Reviewed-on: https://gerrit.libreoffice.org/75863
Tested-by: Jenkins
Reviewed-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, 1 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 632eb860e146..2e1b7c710980 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4514,7 +4514,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("#") && !m_aSaveOpt.IsSaveRelFSys()) { + if (!sURL.startsWith("#")) { 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 40317732273b..fab77099ae56 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -27,7 +27,6 @@ #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> @@ -407,7 +406,6 @@ 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; |