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

[Caolán McNamara (via logerrit)]

 filter/source/flash/swfwriter1.cxx |    4 ----
 starmath/source/cursor.cxx         |    3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit edc8d9650d7fbd98d6b301c662724c97f61128e5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jul 20 15:38:15 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jul 20 20:03:50 2019 +0200

    cid#1448322 try silence Splice iterator mismatch
    
    Change-Id: If419d66811e5a60d50575f7b984811a29785459a
    Reviewed-on: https://gerrit.libreoffice.org/76019
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 538a4f26bf94..2d74d454a2f6 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -743,7 +743,8 @@ bool SmCursor::InsertRow() {
     if(pTable) {
         std::unique_ptr<SmNodeList> pNewLineList(new SmNodeList);
         //Move elements from pLineList to pNewLineList
-        pNewLineList->splice(pNewLineList->begin(), *pLineList, it, pLineList->end());
+        SmNodeList& rLineList = *pLineList;
+        pNewLineList->splice(pNewLineList->begin(), rLineList, it, rLineList.end());
         //Make sure it is valid again
         it = pLineList->end();
         if(it != pLineList->begin())
commit ca7c2f6cd48917fefdbee3585f6ccfd491582c5f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jul 20 14:42:13 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jul 20 20:03:39 2019 +0200

    cid#1448337 Unchecked return value from library
    
    Change-Id: Idac1d04e725f3e6e96d0ec6e83fcba3086c7a5fc
    Reviewed-on: https://gerrit.libreoffice.org/76007
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 7967468650c3..5416ab869442 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -722,14 +722,10 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
     uLongf compressed_size = raw_size + static_cast<sal_uInt32>(raw_size/100) + 12;
     std::unique_ptr<sal_uInt8[]> pCompressed(new sal_uInt8[ compressed_size ]);
 
-#ifdef DBG_UTIL
     if(compress2(pCompressed.get(), &compressed_size, aImageData.data(), raw_size, Z_BEST_COMPRESSION) != Z_OK)
     {
         SAL_WARN( "filter.flash", "compress2 failed!" ); ((void)0);
     }
-#else
-    compress2(pCompressed.get(), &compressed_size, aImageData.data(), raw_size, Z_BEST_COMPRESSION);
-#endif
 
     // AS: SWF files let you provide an Alpha mask for JPEG images, but we have
     //  to ZLIB compress the alpha channel separately.