From 24114cadf10aa9d843d6735d90fcddee3747724d Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 15 Jun 2016 14:55:06 +0200 Subject: 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 Reviewed-by: Michael Stahl --- reportdesign/source/core/api/ReportDefinition.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index f4ccbb0501a5..fb30a371b4ea 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 ...? -- cgit v1.2.3