Kaydet (Commit) 3c2c2eb4 authored tarafından Caolán McNamara's avatar Caolán McNamara

discard broken embedded object previews

Change-Id: I4f632545d383c4887342aa2959987d4ac3638eb4
üst 69bb7c73
......@@ -560,16 +560,25 @@ SvStream* EmbeddedObjectRef::GetGraphicStream( sal_Bool bUpdate ) const
{
const sal_Int32 nConstBufferSize = 32000;
SvStream *pStream = new SvMemoryStream( 32000, 32000 );
sal_Int32 nRead=0;
uno::Sequence < sal_Int8 > aSequence ( nConstBufferSize );
do
try
{
sal_Int32 nRead=0;
uno::Sequence < sal_Int8 > aSequence ( nConstBufferSize );
do
{
nRead = xStream->readBytes ( aSequence, nConstBufferSize );
pStream->Write( aSequence.getConstArray(), nRead );
}
while ( nRead == nConstBufferSize );
pStream->Seek(0);
return pStream;
}
catch (const uno::Exception& ex)
{
nRead = xStream->readBytes ( aSequence, nConstBufferSize );
pStream->Write( aSequence.getConstArray(), nRead );
SAL_WARN("svtools", "discarding broken embedded object preview: " << ex.Message);
delete pStream;
xStream.clear();
}
while ( nRead == nConstBufferSize );
pStream->Seek(0);
return pStream;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment