[Libreoffice-commits] core.git: filter/source

[Stephan Bergmann]

 filter/source/msfilter/escherex.cxx |   38 ++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

New commits:
commit eca4625cfd4bbc0562777a9464ea9bb1ffe5d9f0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 27 17:02:36 2016 +0200

    clang-analyzer-deadcode.DeadStores
    
    Change-Id: I4715798922e1210babe93d861594d48bdd850bfd

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index d5e5cad..5480a58 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 )
                 {