|
 |
20aa85 |
From daa1750bd6944f5202ccb7bc41c57a3f32be766e Mon Sep 17 00:00:00 2001
|
|
|
20aa85 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
20aa85 |
Date: Tue, 1 May 2018 12:57:02 +0100
|
|
|
20aa85 |
Subject: [PATCH] set Referer on link mediadescriptor
|
|
|
20aa85 |
|
|
|
20aa85 |
to allow determining if the source document is from a trusted/untrusted
|
|
|
20aa85 |
location
|
|
|
20aa85 |
|
|
|
20aa85 |
Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
|
|
|
20aa85 |
Reviewed-on: https://gerrit.libreoffice.org/53693
|
|
|
20aa85 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
20aa85 |
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
|
20aa85 |
---
|
|
|
20aa85 |
sw/source/filter/xml/xmltexti.cxx | 13 +++++++++----
|
|
|
20aa85 |
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
20aa85 |
|
|
|
20aa85 |
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
|
|
|
20aa85 |
index 06a6bbe..83d7734 100644
|
|
|
20aa85 |
--- a/sw/source/filter/xml/xmltexti.cxx
|
|
|
20aa85 |
+++ b/sw/source/filter/xml/xmltexti.cxx
|
|
|
20aa85 |
@@ -575,17 +575,22 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
|
|
|
20aa85 |
|
|
|
20aa85 |
uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
|
|
|
20aa85 |
aMediaDescriptor[0].Name = "URL";
|
|
|
20aa85 |
- aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
|
|
|
20aa85 |
- if ( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
|
|
|
20aa85 |
+ aMediaDescriptor[0].Value <<= aURLObj.GetMainURL( INetURLObject::NO_DECODE );
|
|
|
20aa85 |
+
|
|
|
20aa85 |
+ if (SfxMedium* pMedium = pDoc->GetDocShell() ? pDoc->GetDocShell()->GetMedium() : nullptr)
|
|
|
20aa85 |
{
|
|
|
20aa85 |
- uno::Reference< task::XInteractionHandler > xInteraction =
|
|
|
20aa85 |
- pDoc->GetDocShell()->GetMedium()->GetInteractionHandler();
|
|
|
20aa85 |
+ uno::Reference< task::XInteractionHandler > xInteraction = pMedium->GetInteractionHandler();
|
|
|
20aa85 |
if ( xInteraction.is() )
|
|
|
20aa85 |
{
|
|
|
20aa85 |
aMediaDescriptor.realloc( 2 );
|
|
|
20aa85 |
aMediaDescriptor[1].Name = "InteractionHandler";
|
|
|
20aa85 |
aMediaDescriptor[1].Value <<= xInteraction;
|
|
|
20aa85 |
}
|
|
|
20aa85 |
+
|
|
|
20aa85 |
+ const auto nLen = aMediaDescriptor.getLength() + 1;
|
|
|
20aa85 |
+ aMediaDescriptor.realloc(nLen);
|
|
|
20aa85 |
+ aMediaDescriptor[nLen - 1].Name = "Referer";
|
|
|
20aa85 |
+ aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName();
|
|
|
20aa85 |
}
|
|
|
20aa85 |
|
|
|
20aa85 |
uno::Reference < embed::XEmbeddedObject > xObj(
|
|
|
20aa85 |
--
|
|
|
20aa85 |
2.14.3
|
|
|
20aa85 |
|