sc/source/filter/xml/xmlexprt.cxx | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
New commits: commit 918fca99c0bb9ddf2102de9a50f074624802e9cb Author: Markus Mohrhard <[email protected]> Date: Fri Jul 18 20:31:09 2014 +0200 respect flag for relative paths, fdo#79305 Conflicts: sc/source/filter/xml/xmlexprt.cxx Change-Id: I8f4e5f8f5e489d543f81b0b20255c875b83f7afc diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 058e719..f0d0732 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -101,7 +101,8 @@ #include <rtl/ustring.hxx> -#include "tools/color.hxx" +#include <tools/color.hxx> +#include <tools/urlobj.hxx> #include <rtl/math.hxx> #include <svl/zforlist.hxx> #include <svx/unoshape.hxx> @@ -114,6 +115,9 @@ #include <svx/svdpage.hxx> #include <svtools/miscopt.hxx> +#include <officecfg/Office/Common.hxx> + +#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNamed.hpp> @@ -3079,7 +3083,17 @@ 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_TYPE, "simple"); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
