[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source

[Eike Rathke]

 sc/source/filter/xml/xmlexprt.cxx |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 7633ae819b0c29c2c108158d43d4d3f9c4622e7e
Author: Eike Rathke <er...@redhat.com>
Date:   Mon Jul 21 18:50:31 2014 +0200

    use SvXMLExport::GetRelativeReference(), fdo#79305
    
    ... instead of a manual approach that missed one extra package level.
    
    Change-Id: I41c76eb84677fcf49eb09830127a419ed23ec643
    (cherry picked from commit bc3b62e25eb0c3921fa600e80eeb314e45ecaaef)
    Reviewed-on: https://gerrit.libreoffice.org/10444
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 9fb515a..7d00d39 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3090,18 +3090,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(

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits