[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/filter/xml/xmltexti.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6fc42d053d2e3aedecc3d18e1cdaf1fa3c3da6b3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 28 15:54:12 2015 +0000

    crashtesting: assert on export of fdo45349-3.fodt to doc
    
    set a DefaultParentBaseURL fallback from createAndInsertOLEObject
    
    Change-Id: Ibc6e800be66f966533a8304ddf72eefa2b39fb8a

diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index a57a910..69b5752 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?