diff options
Diffstat (limited to 'svx/source/svdraw/svdograf.cxx')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 40d652b3ba99..42c33ce7a0f2 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -991,7 +991,6 @@ void SdrGrafObj::SetModel( SdrModel* pNewModel ) if( pGraphic->HasUserData() ) { ForceSwapIn(); - pGraphic->SetUserData(); } if( pGraphicLink != NULL ) @@ -1282,7 +1281,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) { const sal_uIntPtr nSwapMode = pModel->GetSwapGraphicsMode(); - if( ( pGraphic->HasUserData() || pGraphicLink ) && + if( ( pGraphicLink ) && ( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) ) { pRet = GRFMGR_AUTOSWAPSTREAM_LINK; @@ -1392,22 +1391,7 @@ Reference< XInputStream > SdrGrafObj::getInputStream() if( pModel ) { - // can be loaded from the original document stream later - if( pGraphic && pGraphic->HasUserData() ) - { - ::comphelper::LifecycleProxy proxy; - xStream.set( - pModel->GetDocumentStream(pGraphic->GetUserData(), proxy)); - // fdo#46340: this may look completely insane, and it is, - // but it also prevents a crash: the LifecycleProxy will go out - // of scope, but the xStream must be returned; the UcbStreamHelper - // will actually copy the xStream to a temp file (because it is - // not seekable), which makes it not crash... - SvStream *const pStream = - utl::UcbStreamHelper::CreateStream(xStream); - xStream.set(new utl::OInputStreamWrapper(pStream, true)); - } - else if( pGraphic && GetGraphic().IsLink() ) + if( pGraphic && GetGraphic().IsLink() ) { Graphic aGraphic( GetGraphic() ); GfxLink aLink( aGraphic.GetLink() ); |