diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 13:03:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 13:03:41 +0000 |
| commit | 52b7c9596dafe5bf8c96a5e8f261180c008e99a8 (patch) | |
| tree | 1165fee97769a72afc56ddc44a9df6b041b05293 /svx/source/svdraw/svdoole2.cxx | |
| parent | 12980c6d7562fb4884c85980740acb657c193d0f (diff) | |
INTEGRATION: CWS fwkfinal1 (1.53.28); FILE MERGED
2005/03/11 14:21:24 cd 1.53.28.2: RESYNC: (1.53-1.54); FILE MERGED
2005/03/09 11:15:17 mav 1.53.28.1: #i43950# copy replacement image
Diffstat (limited to 'svx/source/svdraw/svdoole2.cxx')
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 430d5fffeea0..65024db65aba 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdoole2.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: kz $ $Date: 2005-03-18 17:09:22 $ + * last change: $Author: vg $ $Date: 2005-03-23 14:03:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -878,7 +878,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) DBG_ASSERT( !xObjRef.is() || xObjRef.GetObject() == xObj, "Wrong object identity!" ); if ( xObj.is() ) { - pDestPers->GetEmbeddedObjectContainer().CopyEmbeddedObject( xObj, aTmp ); + pDestPers->GetEmbeddedObjectContainer().CopyEmbeddedObject( rContainer, xObj, aTmp ); if ( xObjRef.is() ) { @@ -1251,7 +1251,7 @@ void SdrOle2Obj::ImpCopyObject( SfxObjectShell* pSrcPersist, SfxObjectShell* pDs if ( xObj.is() ) { ::rtl::OUString aTmp; - pDstPersist->GetEmbeddedObjectContainer().CopyEmbeddedObject( xObj, aTmp ); + pDstPersist->GetEmbeddedObjectContainer().CopyEmbeddedObject( rContainer, xObj, aTmp ); rPersistName = aTmp; CheckFileLink_Impl(); } |