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

INTEGRATION: CWS impress8ea1 (1.30.88); FILE MERGED

Browse source 
2004/04/21 17:36:38 cl 1.30.88.1: #i27567# dispose temporary uno model before deleting it
This commit is contained in:
Jens-Heiner Rechtien 2004-05-10 10:54:28 +00:00
parent 83e4253488
commit 316e7ef0e0
1 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,9 @@
*
* $RCSfile: sdxfer.cxx,v $
*
* $Revision: 1.30 $
* $Revision: 1.31 $
*
* last change: $Author: obo $ $Date: 2004-01-20 10:38:13 $
* last change: $Author: hr $ $Date: 2004-05-10 11:54:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -613,35 +613,44 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
{
case( SDTRANSFER_OBJECTTYPE_DRAWMODEL ):
{
SdDrawDocument* pDoc = (SdDrawDocument*) pObject;
pDoc->BurnInStyleSheetAttributes();
pDoc->SetStreamingSdrModel( TRUE );
pDoc->RemoveNotPersistentObjects( TRUE );
rxOStm->SetBufferSize( 16348 );
Reference< XComponent > xComponent( new SdXImpressDocument( pDoc, sal_True ) );
pDoc->setUnoModel( Reference< XInterface >::query( xComponent ) );
try
{
com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *rxOStm ) );
if( SvxDrawingLayerExport( pDoc, xDocOut, xComponent, (pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? "com.sun.star.comp.Impress.XMLClipboardExporter" : "com.sun.star.comp.DrawingLayer.XMLExporter" ) )
rxOStm->Commit();
}
SdDrawDocument* pDoc = (SdDrawDocument*) pObject;
pDoc->BurnInStyleSheetAttributes();
pDoc->SetStreamingSdrModel( TRUE );
pDoc->RemoveNotPersistentObjects( TRUE );
rxOStm->SetBufferSize( 16348 );
/* testcode
Reference< XComponent > xComponent( new SdXImpressDocument( pDoc, sal_True ) );
pDoc->setUnoModel( Reference< XInterface >::query( xComponent ) );
{
com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *rxOStm ) );
if( SvxDrawingLayerExport( pDoc, xDocOut, xComponent, (pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? "com.sun.star.comp.Impress.XMLClipboardExporter" : "com.sun.star.comp.DrawingLayer.XMLExporter" ) )
rxOStm->Commit();
}
/* testcode
{
const rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, TRUE );
aMedium.IsRemote();
com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
if( SvxDrawingLayerExport( pDoc, xDocOut, xComponent, (pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? "com.sun.star.comp.Impress.XMLClipboardExporter" : "com.sun.star.comp.DrawingLayer.XMLExporter" ) )
aMedium.Commit();
}
*/
pDoc->SetStreamingSdrModel( FALSE );
xComponent->dispose();
bRet = ( rxOStm->GetError() == ERRCODE_NONE );
}
catch( Exception& )
{
const rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, TRUE );
aMedium.IsRemote();
com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
if( SvxDrawingLayerExport( pDoc, xDocOut, xComponent, (pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? "com.sun.star.comp.Impress.XMLClipboardExporter" : "com.sun.star.comp.DrawingLayer.XMLExporter" ) )
aMedium.Commit();
DBG_ERROR( "sd::SdTransferable::WriteObject(), exception catched!" );
bRet = FALSE;
}
*/
pDoc->SetStreamingSdrModel( FALSE );
bRet = ( rxOStm->GetError() == ERRCODE_NONE );
}
break;