summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-06-15 14:55:06 +0200
committerMichael Stahl <mstahl@redhat.com>2016-06-15 21:08:10 +0000
commit24114cadf10aa9d843d6735d90fcddee3747724d (patch)
treefc6420dfdcf4d34ca5d01f9585c10934a5e81706 /reportdesign
parentef952e6c9756c3b2bde7d82202fb32a905a14daa (diff)
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@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx5
1 files changed, 5 insertions, 0 deletions
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 ...?