summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-07-21 18:50:31 +0200
committerEike Rathke <erack@redhat.com>2014-07-21 18:52:57 +0200
commitbc3b62e25eb0c3921fa600e80eeb314e45ecaaef (patch)
tree9f15232a6a4a772a47c1755cb2da03f4a276ee8d
parent2949d3ccc547d77c7e064a0d34c5d92c565bdcbb (diff)
use SvXMLExport::GetRelativeReference(), fdo#79305
... instead of a manual approach that missed one extra package level. Change-Id: I41c76eb84677fcf49eb09830127a419ed23ec643
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx12
1 files changed, 1 insertions, 11 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 70243ebf6638..6e59a8364d09 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3084,18 +3084,8 @@ void writeContent(
{
// <text:a xlink:href="url" xlink:type="simple">value</text:a>
- Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
- bool bUseRelative = officecfg::Office::Common::Save::URL::FileSystem::get( xContext );
OUString aURL = static_cast<const SvxURLField*>(pField)->GetURL();
- if(bUseRelative)
- {
- OUString aBase = rExport.GetOrigFileName();
- INetURLObject aURLObject(aBase);
- aURLObject.removeSegment();
- aURLObject.removeSegment();
- aURL = INetURLObject::GetRelURL(aURLObject.GetMainURL(INetURLObject::DECODE_TO_IURI), aURL);
- }
- rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aURL);
+ rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, rExport.GetRelativeReference(aURL));
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, "simple");
OUString aElemName = rExport.GetNamespaceMap().GetQNameByKey(