[Libreoffice-commits] core.git: 2 commits - extensions/source sc/source

[Caolán McNamara]

 extensions/source/scanner/sane.cxx   |    7 +++++--
 sc/source/filter/excel/xecontent.cxx |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 351202fd9bff1a9cf5b82d6aef5df14a4222a5e9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 24 09:39:37 2017 +0100

    coverity#1242860 Unused value + loplugin:casttovoid
    
    Change-Id: I80725fbde6fbf29d47f0b462ff22e6be4fbebaca

diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 006b4c6c59a7..976d76aefbe3 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -666,9 +666,12 @@ bool Sane::Start( BitmapTransporter& rBitmap )
             if( nStatus != SANE_STATUS_GOOD )
             {
                 bSynchronousRead = false;
-                nStatus = p_set_io_mode(maHandle, SANE_TRUE); (void)nStatus;
+                nStatus = p_set_io_mode(maHandle, SANE_TRUE);
                 CheckConsistency( "sane_set_io_mode" );
-                SAL_WARN_IF(nStatus != SANE_STATUS_GOOD, "extensions.scanner", "driver is confused" );
+                if (nStatus != SANE_STATUS_GOOD)
+                {
+                    SAL_WARN("extensions.scanner", "SANE driver status is: " << nStatus);
+                }
             }
 
             SANE_Int nLen=0;
commit fcefc0d4aba8a7001f07a18e044776dc9dc4bb5e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 24 08:49:24 2017 +0100

    coverity#1371289 Missing move assignment operator
    
    Change-Id: I362f2b53c5095810111f0a393e527a38e2abf0e1

diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index bf5534e32dbd..62682e07d405 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1679,7 +1679,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
                         nLen = 256;
                         if( sFormulaBuf[nLen - 1] == ',' )
                             --nLen;
-                        sFormulaBuf = sFormulaBuf.copy(0, nLen);
+                        sFormulaBuf.truncate(nLen);
                     }
 
                     sFormulaBuf.append( '"' );