summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-11-16 20:35:30 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-11-16 20:35:30 +0100
commitdb686e8ae12e4c554e24d0c262915fb1bf45525b (patch)
tree21a75d3f398d81c2b9225f4e713ece3cd9659ff3 /svx
parentb0c97aecb22cfa8d845cdc7d2764a4320b53baf6 (diff)
Logically dead code related to embedded stream name in SwGrfNode\SdrGrafObj
See also: 286e2f5c6ec829bc0987b1be7016699f7ef03e5e Since embedded URL exists until the first swap in these lines are not needed anymore. Change-Id: Ie6bf8efe7808cf42f20f7b4b3f8cb927555c0ea8
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdograf.cxx20
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() );