diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-11-14 19:55:42 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-11-19 21:15:29 +0100 |
| commit | 40acf8d6447065077acba9e800c56239f58c8262 (patch) | |
| tree | a744d809a0e83f2d1fffa5bb5ef6a136158f9056 | |
| parent | d5e30952beeb87b62048a9e3a34800e9a948b5a8 (diff) | |
tdf#86087 DOCX Import link as relative if preferred
Change-Id: I92e273aa57db8b4b9779d8d784c5bbad42d720e5
Reviewed-on: https://gerrit.libreoffice.org/44735
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
| -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 f5786ac3fe38..0443954f5a41 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4035,7 +4035,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 bf5c2644e182..589a79953f13 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> @@ -391,6 +392,7 @@ public: private: SourceDocumentType m_eDocumentType; DomainMapper& m_rDMapper; + SvtSaveOptions m_aSaveOpt; OUString m_aBaseUrl; css::uno::Reference<css::text::XTextDocument> m_xTextDocument; css::uno::Reference<css::beans::XPropertySet> m_xDocumentSettings; |