diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-06-27 17:02:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-06-27 17:02:36 +0200 |
| commit | eca4625cfd4bbc0562777a9464ea9bb1ffe5d9f0 (patch) | |
| tree | b26ee7d5b324aaf1f0802d4fa3b6a410a78f5d05 /filter | |
| parent | rename *effective to *effect, tdf#100641 related (diff) | |
| download | core-eca4625cfd4bbc0562777a9464ea9bb1ffe5d9f0.tar.gz core-eca4625cfd4bbc0562777a9464ea9bb1ffe5d9f0.zip | |
clang-analyzer-deadcode.DeadStores
Change-Id: I4715798922e1210babe93d861594d48bdd850bfd
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index d5e5cadb2448..5480a584352e 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4303,22 +4303,28 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin aGIFStream.WriteBytes(pString, strlen(pString)); nErrCode = rFilter.ExportGraphic( aGraphic, OUString(), aGIFStream, rFilter.GetExportFormatNumberForShortName( "GIF" ) ); - css::uno::Sequence< css::beans::PropertyValue > aFilterData( 1 ); - css::uno::Sequence< css::beans::PropertyValue > aAdditionalChunkSequence( 1 ); - sal_uInt32 nGIFSreamLen = aGIFStream.Tell(); - css::uno::Sequence< sal_Int8 > aGIFSeq( nGIFSreamLen ); - sal_Int8* pSeq = aGIFSeq.getArray(); - aGIFStream.Seek( STREAM_SEEK_TO_BEGIN ); - aGIFStream.ReadBytes(pSeq, nGIFSreamLen); - css::beans::PropertyValue aChunkProp, aFilterProp; - aChunkProp.Name = "msOG"; - aChunkProp.Value <<= aGIFSeq; - aAdditionalChunkSequence[ 0 ] = aChunkProp; - aFilterProp.Name = "AdditionalChunks"; - aFilterProp.Value <<= aAdditionalChunkSequence; - aFilterData[ 0 ] = aFilterProp; - nErrCode = rFilter.ExportGraphic( aGraphic, OUString(), aStream, - rFilter.GetExportFormatNumberForShortName( "PNG" ), &aFilterData ); + SAL_WARN_IF( + nErrCode != ERRCODE_NONE, "filter.ms", + "ExportGraphic to GIF failed with " << nErrCode); + if (nErrCode == ERRCODE_NONE) + { + css::uno::Sequence< css::beans::PropertyValue > aFilterData( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aAdditionalChunkSequence( 1 ); + sal_uInt32 nGIFSreamLen = aGIFStream.Tell(); + css::uno::Sequence< sal_Int8 > aGIFSeq( nGIFSreamLen ); + sal_Int8* pSeq = aGIFSeq.getArray(); + aGIFStream.Seek( STREAM_SEEK_TO_BEGIN ); + aGIFStream.ReadBytes(pSeq, nGIFSreamLen); + css::beans::PropertyValue aChunkProp, aFilterProp; + aChunkProp.Name = "msOG"; + aChunkProp.Value <<= aGIFSeq; + aAdditionalChunkSequence[ 0 ] = aChunkProp; + aFilterProp.Name = "AdditionalChunks"; + aFilterProp.Value <<= aAdditionalChunkSequence; + aFilterData[ 0 ] = aFilterProp; + nErrCode = rFilter.ExportGraphic( aGraphic, OUString(), aStream, + rFilter.GetExportFormatNumberForShortName( "PNG" ), &aFilterData ); + } } if ( nErrCode == ERRCODE_NONE ) { |