summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-28 15:54:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-12-28 21:43:44 +0000
commit6fc42d053d2e3aedecc3d18e1cdaf1fa3c3da6b3 (patch)
tree79b19becaf99847487554d3ba0fa9d56bfae1602 /sw
parentad7d76add51736bc035afb5c64acc35feea74c6c (diff)
crashtesting: assert on export of fdo45349-3.fodt to doc
set a DefaultParentBaseURL fallback from createAndInsertOLEObject Change-Id: Ibc6e800be66f966533a8304ddf72eefa2b39fb8a
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/xml/xmltexti.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index a57a910aee9b..69b5752977e1 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -276,10 +276,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
OUString aName("DummyName");
uno::Sequence < sal_Int8 > aClass( aClassName.GetByteSequence() );
uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() );
+ uno::Sequence<beans::PropertyValue> aObjArgs(1);
+ aObjArgs[0].Name = "DefaultParentBaseURL";
+ aObjArgs[0].Value <<= GetXMLImport().GetBaseURL();
uno::Reference < embed::XEmbeddedObject > xObj =
uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew(
- aClass, OUString(), xStorage, aName,
- uno::Sequence < beans::PropertyValue >() ), uno::UNO_QUERY );
+ aClass, OUString(), xStorage, aName, aObjArgs), uno::UNO_QUERY );
if ( xObj.is() )
{
//TODO/LATER: is it enough to only set the VisAreaSize?