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

Stephan Bergmann sbergman at redhat.com
Thu Oct 26 21:26:52 UTC 2017


 sfx2/source/bastyp/bitset.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6f065a7aff86528e5c780dccb50aeaecdb7896fb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 26 23:24:41 2017 +0200

    Avoid undefined left shift of signed integer
    
    ...after 022b1b2a40fcaf8d201081dead44c1d3346d1972 "tdf#96505 Get rid of cargo
    cult long integer literals"
    
    Change-Id: I9e5cc9d63c2eddd1ad766c2f6b01a9ff49a09bfd

diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 665209b4c554..8a49a02661c9 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -29,7 +29,7 @@
 IndexBitSet& IndexBitSet::operator-=(sal_uInt16 nBit)
 {
     sal_uInt16 nBlock = nBit / 32;
-    sal_uInt32 nBitVal = 1 << (nBit % 32);
+    sal_uInt32 nBitVal = 1U << (nBit % 32);
 
     if ( nBlock >= nBlocks )
       return *this;
@@ -48,7 +48,7 @@ IndexBitSet& IndexBitSet::operator-=(sal_uInt16 nBit)
 IndexBitSet& IndexBitSet::operator|=( sal_uInt16 nBit )
 {
     sal_uInt16 nBlock = nBit / 32;
-    sal_uInt32 nBitVal = 1 << (nBit % 32);
+    sal_uInt32 nBitVal = 1U << (nBit % 32);
 
     if ( nBlock >= nBlocks )
     {
@@ -78,7 +78,7 @@ IndexBitSet& IndexBitSet::operator|=( sal_uInt16 nBit )
 bool IndexBitSet::Contains( sal_uInt16 nBit ) const
 {
     sal_uInt16 nBlock = nBit / 32;
-    sal_uInt32 nBitVal = 1 << (nBit % 32);
+    sal_uInt32 nBitVal = 1U << (nBit % 32);
 
     if ( nBlock >= nBlocks )
         return false;


More information about the Libreoffice-commits mailing list