[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - xmloff/source

[Michael Stahl]

 xmloff/source/forms/elementimport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2bd85bfd98203cc11e2391e01e9f8d70a9037214
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Jul 6 17:33:28 2018 +0200

    tdf#117261 xmloff: ODF import: convert form:connection-resource URL
    
    ... to absolute on import.
    
    (regression from fbb3b60cdb7a22595eec80232bb3ccd83781cf00)
    
    Change-Id: I2cd046e44489da86d3d67ff5df6cbad13e8265d0
    Reviewed-on: https://gerrit.libreoffice.org/57076
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins
    (cherry picked from commit 510209df4bcf457cac819e75889d564d620f119d)
    Reviewed-on: https://gerrit.libreoffice.org/57093
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 74775302105e..f54e18dc1e84 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -2041,7 +2041,7 @@ namespace xmloff
                 )
             {
                 OUString sValue = _xAttrList->getValueByIndex( i );
-
+                sValue = _rImport.GetAbsoluteReference(sValue);
                 INetURLObject aURL(sValue);
                 if ( aURL.GetProtocol() == INetProtocol::File )
                     _xElement->setPropertyValue(PROPERTY_DATASOURCENAME,makeAny(sValue));