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

[Libreoffice Gerrit user]

 sc/source/core/data/formulacell.cxx |    2 +-
 sc/source/filter/inc/ftools.hxx     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 684641b3f85850f9ae1bd36ef24e4ca89fac95f4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 18 20:18:25 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 19 00:39:32 2018 +0100

    coverity#1441441 Uncaught exception
    
    Change-Id: I0c2208abe6a995d4980bd93bc5466306c6de696d
    Reviewed-on: https://gerrit.libreoffice.org/63534
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 4438e7ef100f..a153b68bafdc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1502,7 +1502,7 @@ struct TemporaryCellGroupMaker
             mCell->GetDocument()->GetRecursionHelper().AddTemporaryGroupCell( mCell );
         }
     }
-    ~TemporaryCellGroupMaker()
+    ~TemporaryCellGroupMaker() COVERITY_NOEXCEPT_FALSE
     {
         if( mEnabled )
             mCell->GetDocument()->GetRecursionHelper().CleanTemporaryGroupCells();
commit 55df51923cfee438092e6f259574710418d62224
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 18 20:23:09 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 19 00:39:18 2018 +0100

    coverity#1441442 Unintended sign extension
    
    Change-Id: Id0286f34ccc387dd148e42b83e8f62aacfb54219
    Reviewed-on: https://gerrit.libreoffice.org/63535
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 1fcfe6339f2f..81b0b44e688c 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -99,7 +99,7 @@ inline void set_flag( Type& rnBitField, Type nMask, bool bSet = true )
 template< typename Type, typename InsertType >
 void insert_value( Type& rnBitField, InsertType nValue, sal_uInt8 nStartBit, sal_uInt8 nBitCount )
 {
-    unsigned long nMask = ((1UL << nBitCount) - 1);
+    unsigned int nMask = ((1U << nBitCount) - 1);
     Type nNewValue = static_cast< Type >( nValue & nMask );
     rnBitField = (rnBitField & ~(nMask << nStartBit)) | (nNewValue << nStartBit);
 }