[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - reportdesign/source

[Michael Stahl]

 reportdesign/source/core/api/ReportDefinition.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 24114cadf10aa9d843d6735d90fcddee3747724d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 15 14:55:06 2016 +0200

    tdf#100325 reportdesign: try to set URL as DocumentBaseURL
    
    ... if it is missing, similar to what SfxObjectShell::DoLoad() does.
    
    Change-Id: I5b0ae1f892355a5e9786d590c821656b58d29cf2
    (cherry picked from commit cd7671ef5e3102e91c68588d1ccc39d2521af561)
    Reviewed-on: https://gerrit.libreoffice.org/26332
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index f4ccbb0..fb30a37 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1694,6 +1694,11 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue
         throw uno::RuntimeException();
     }
 
+    if (!aArguments.has("DocumentBaseURL") && !sURL.isEmpty())
+    {
+        aArguments.put("DocumentBaseURL", sURL);
+    }
+
     impl_loadFromStorage_nolck_throw( xDocumentStorage, aArguments.getPropertyValues() );
     // TODO: do we need to take ownership of the storage? In opposite to loadFromStorage, we created the storage
     // ourself here, and perhaps this means we're also responsible for it ...?