diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-12-21 21:16:08 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-22 20:14:40 +0000 |
commit | 0f02bc189b6e89ca2e62d4bd6a2f407a9fd4ec3b (patch) | |
tree | e33175c301413ad98d2dff96659a054a03191b17 /sw | |
parent | 8a05b74eeb8d5e0955fbe3cefd945cdc9bffa3f5 (diff) |
crashtesting: CreateShellID returns the mediums base url...
when it works the way we want it to work, so presumably we can cut out the
middle man and use getDocumentBaseURL directly which does the same thing.
This has the advantage of being in the IEmbeddedHelper api so assignFrom can be
tweaked to pull the src and dest ids arguments to CopyAndGetEmbeddedObject from
the src and dest IEmbeddedHelpers always available there. So we ensure we
have some ids to present to CopyAndGetEmbeddedObject, avoiding the assert
on converting documents such as ooo89433-1.ppt to pdf
So the explicit args can apparently be dropped, bubbling up then means we don't
need a CloneWithShellIDs (introduced with tdf#71076 and tdf#71767) as normal
Clone should now do the right thing.
And various other arguments in various callers of these, which are typically
filled in with an unhelpful empty OUString placeholder, can go
Change-Id: I9c0be0340e72f98b10ee87ada7d2a021fcc39e23
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/ole/ndole.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 55ece42fad2f..b40a0bfd5899 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1518,7 +1518,7 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt ) // #i50824# // method <lcl_RemoveOleObjsFromSdrModel> replaced by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs> lcl_ConvertSdrOle2ObjsToSdrGrafObjs( pModel ); - pView->Paste(*pModel, aPos, nullptr, SdrInsertFlags::NONE, OUString(), OUString()); + pView->Paste(*pModel, aPos, nullptr, SdrInsertFlags::NONE); const size_t nCnt = pView->GetMarkedObjectList().GetMarkCount(); if( nCnt ) diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 6089e69ac6ad..5db900b62b36 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, - SfxObjectShell::CreateShellID(pSrc), - SfxObjectShell::CreateShellID(pPersistShell)); + pSrc->getDocumentBaseURL(), + pPersistShell->getDocumentBaseURL()); SwOLENode* pOLENd = pDoc->GetNodes().MakeOLENode( rIdx, aNewName, GetAspect(), pDoc->GetDfltGrfFormatColl(), |