strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress64 (1.40.162); FILE MERGED

Browse source 
2005/07/13 16:40:17 cl 1.40.162.1: #i51550# always create model with persist in CreateData(), even for GetData()
This commit is contained in:
Oliver Bolte 2005-07-18 12:05:19 +00:00
parent 435136e943
commit 154cb20678
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sd/source/ui/app/sdxfer.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: sdxfer.cxx,v $
*
* $Revision: 1.41 $
* $Revision: 1.42 $
*
* last change: $Author: kz $ $Date: 2005-07-14 11:28:37 $
* last change: $Author: obo $ $Date: 2005-07-18 13:05:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -550,9 +550,22 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
}
else if( nFormat == SOT_FORMATSTR_ID_DRAWING )
{
SfxObjectShellRef aOldRef( aDocShellRef );
aDocShellRef.Clear();
if( pSourceDoc )
pSourceDoc->CreatingDataObj(this);
SdDrawDocument* pDoc = (SdDrawDocument*) pSdViewIntern->GetAllMarkedModel();
if( pSourceDoc )
pSourceDoc->CreatingDataObj(0);
bOK = SetObject( pDoc, SDTRANSFER_OBJECTTYPE_DRAWMODEL, rFlavor );
if( !aDocShellRef.Is() )
delete pDoc;
aDocShellRef = aOldRef;
}
else if( nFormat == FORMAT_GDIMETAFILE )
{