mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logically dead code related to embedded stream name in SwGrfNode\SdrGrafObj

Browse Source 
See also:
286e2f5c6e

Since embedded URL exists until the first swap in these lines
are not needed anymore.

Change-Id: Ie6bf8efe7808cf42f20f7b4b3f8cb927555c0ea8
This commit is contained in:
Zolnai Tamás
2014-11-16 20:35:30 +01:00
parent b0c97aecb2
commit db686e8ae1
2 changed files with 4 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
svx/source/svdraw/svdograf.cxx
View File

@@ -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() );

57
sw/source/core/graphic/ndgrf.cxx
View File

@@ -608,7 +608,7 @@ bool SwGrfNode::SwapOut()
maGrfObj.GetType() != GRAPHIC_NONE &&
!maGrfObj.IsSwappedOut() && !bInSwapIn )
{
if( refLink.Is() || HasEmbeddedStreamName() )
if( refLink.Is() )
{
// written graphics and links are removed here
return maGrfObj.SwapOut( GRFMGR_AUTOSWAPSTREAM_LINK );
@@ -931,32 +931,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
// copy formats into the other document
SwGrfFmtColl* pColl = pDoc->CopyGrfColl( *GetGrfColl() );
Graphic aTmpGrf;
SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
if( !pLink && HasEmbeddedStreamName() )
{
try
{
const StreamAndStorageNames aNames = lcl_GetStreamStorageNames( maGrfObj.GetUserData() );
uno::Reference < embed::XStorage > refPics = _GetDocSubstorageOrRoot( aNames.sStorage );
SvStream* pStrm = _GetStreamForEmbedGrf( refPics, aNames.sStream );
if ( pStrm )
{
const OUString aURL(maGrfObj.GetUserData());
GraphicFilter::GetGraphicFilter().ImportGraphic(aTmpGrf, aURL, *pStrm);
delete pStrm;
}
}
catch (const uno::Exception& e)
{
// #i48434#
SAL_WARN("sw.core", "<SwGrfNode::MakeCopy(..)> - unhandled exception!" << e.Message);
}
}
else
{
aTmpGrf = GetGrf();
}
Graphic aTmpGrf = GetGrf();
const sfx2::LinkManager& rMgr = getIDocumentLinksAdministration()->GetLinkManager();
OUString sFile, sFilter;
@@ -1009,34 +984,6 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
else
{
pRet = GRFMGR_AUTOSWAPSTREAM_TEMP;
if( HasEmbeddedStreamName() )
{
try
{
const StreamAndStorageNames aNames = lcl_GetStreamStorageNames( maGrfObj.GetUserData() );
uno::Reference < embed::XStorage > refPics = _GetDocSubstorageOrRoot( aNames.sStorage );
SvStream* pStrm = _GetStreamForEmbedGrf( refPics, aNames.sStream );
if ( pStrm )
{
if( pGrfObj->IsInSwapOut() )
{
pRet = GRFMGR_AUTOSWAPSTREAM_LINK;
}
else
{
ImportGraphic( *pStrm );
pRet = GRFMGR_AUTOSWAPSTREAM_LOADED;
}
delete pStrm;
}
}
catch (const uno::Exception&)
{
// #i48434#
OSL_FAIL( "<SwapGraphic> - unhandled exception!" );
}
}
}
return (sal_IntPtr)pRet;