From b62394688569421847d79098ac9ac576b62f24f6 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 15 Dec 2015 16:39:14 +0100 Subject: sw: set a BaseURL when copying embedded objects Turns out that SfxObjectShell::CreateShellID() will produce the SfxMedium's base URL if it exists, so EmbeddedObjectContainer::CopyAndGetEmbeddedObject() already has parameters, sw just needs to set them. Change-Id: I36cedfde4e7c2e25c43c66a30d8ca572f099ad69 (cherry picked from commit e4a06fc983fd6a94a6138503c3fc94b567bc3a68) --- sw/source/core/ole/ndole.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sw/source') diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 8facbeec776b..6089e69ac6ad 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -439,8 +439,8 @@ SwContentNode* SwOLENode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const pSrc->GetEmbeddedObjectContainer(), pSrc->GetEmbeddedObjectContainer().GetEmbeddedObject( aOLEObj.aName ), aNewName, - OUString(), - OUString()); + SfxObjectShell::CreateShellID(pSrc), + SfxObjectShell::CreateShellID(pPersistShell)); SwOLENode* pOLENd = pDoc->GetNodes().MakeOLENode( rIdx, aNewName, GetAspect(), pDoc->GetDfltGrfFormatColl(), -- cgit