diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-12-15 16:39:14 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-12-15 19:55:56 +0100 |
| commit | b62394688569421847d79098ac9ac576b62f24f6 (patch) | |
| tree | 24a9e15e61d941d0b166968ebbea926cf079b32e /sw/source | |
| parent | 751b6f2ccb4993e1a9007f47bad6b98e53b7ed77 (diff) | |
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)
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/ole/ndole.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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(), |