diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-01 12:57:02 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-27 14:12:28 +0200 |
| commit | 9323c8f128d950223287cd8d0f8ed539589a1f8b (patch) | |
| tree | 75b155588c2312e8df1aaf973022412b918c0dc0 | |
| parent | keep track of available data (diff) | |
| download | core-9323c8f128d950223287cd8d0f8ed539589a1f8b.tar.gz core-9323c8f128d950223287cd8d0f8ed539589a1f8b.zip | |
set Referer on link mediadescriptor
to allow determining if the source document is from a trusted/untrusted
location
Reviewed-on: https://gerrit.libreoffice.org/53693
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926)
Reviewed-on: https://gerrit.libreoffice.org/53803
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04)
Conflicts:
sw/source/filter/xml/xmltexti.cxx
Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
| -rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 710f010b1cdc..943db05c75bf 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -577,16 +577,21 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 ); aMediaDescriptor[0].Name = "URL"; aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); - if ( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() ) + + if (SfxMedium* pMedium = pDoc->GetDocShell() ? pDoc->GetDocShell()->GetMedium() : nullptr) { - uno::Reference< task::XInteractionHandler > xInteraction = - pDoc->GetDocShell()->GetMedium()->GetInteractionHandler(); + uno::Reference< task::XInteractionHandler > xInteraction = pMedium->GetInteractionHandler(); if ( xInteraction.is() ) { aMediaDescriptor.realloc( 2 ); aMediaDescriptor[1].Name = "InteractionHandler"; aMediaDescriptor[1].Value <<= xInteraction; } + + const auto nLen = aMediaDescriptor.getLength() + 1; + aMediaDescriptor.realloc(nLen); + aMediaDescriptor[nLen - 1].Name = "Referer"; + aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName(); } uno::Reference < embed::XEmbeddedObject > xObj( |