diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-09 16:57:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-09 16:57:32 +0000 |
| commit | 7c76db3c88d5fa27776c7c5efa04249a6a7ed559 (patch) | |
| tree | 496dd0c8ba8a1ed7a0341fcaabd877b22f3904db | |
| parent | 77846edf44512d48f21300bec0b75b94362774b2 (diff) | |
crashtesting: ooo104626-3.odt assert on reexport to odt
try setting DefaultParentBaseURL based on the parent BaseURL
for objects created this way
Change-Id: I8cb1e9692cc4255c0a0b11b6df4bacee737ae184
| -rw-r--r-- | sw/source/core/ole/ndole.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index d508654ade10..608e79248f95 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -774,7 +774,8 @@ const uno::Reference < embed::XEmbeddedObject > SwOLEObj::GetOleRef() SfxObjectShell* p = pOLENd->GetDoc()->GetPersist(); assert(p && "No SvPersist present"); - uno::Reference < embed::XEmbeddedObject > xObj = p->GetEmbeddedObjectContainer().GetEmbeddedObject( aName ); + OUString sDocumentBaseURL = p->getDocumentBaseURL(); + uno::Reference < embed::XEmbeddedObject > xObj = p->GetEmbeddedObjectContainer().GetEmbeddedObject(aName, &sDocumentBaseURL); OSL_ENSURE( !xOLERef.is(), "Calling GetOleRef() recursively is not permitted" ); if ( !xObj.is() ) |