[Libreoffice-commits] core.git: 2 commits - include/vcl oox/source vcl/source

[Noel Grandin]

 include/vcl/salnativewidgets.hxx   |    1 +
 oox/source/ole/vbainputstream.cxx  |    2 +-
 vcl/source/filter/igif/gifread.cxx |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6c785f65ea5cc961c0a079455973f3086731b2c9
Author: Noel Grandin <noel at peralex.com>
Date:   Fri May 20 11:05:21 2016 +0200

    fix KDE4 build
    
    after 72edb696 "loplugin:unusedmethods in vcl"
    
    Change-Id: I15d884b39b38da80bcf10ca81161d0dcb5683954

diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index b2dd626..dea3579 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -447,6 +447,7 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue
         bool isBothAligned() const  { return isLeftAligned() && isRightAligned(); }
         bool isNotAligned() const   { return !(mnAlignment & (TabitemFlags::LeftAligned | TabitemFlags::RightAligned)); }
         bool isFirst() const        { return bool(mnAlignment & TabitemFlags::FirstInGroup); }
+        bool isLast() const         { return bool(mnAlignment & TabitemFlags::LastInGroup); }
         const Rectangle& getContentRect() const { return maContentRect; }
 };
 
commit 4a8caa37fe83c389f4fd43219e8ea0f21f03c6fe
Author: Noel Grandin <noel at peralex.com>
Date:   Fri May 20 10:42:23 2016 +0200

    warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits
    
    in VisualStudio
    
    reported by Luke Benes
    
    Change-Id: I908039750a3e89e4d1b77631f7d309191735c765

diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx
index 65eb91c..e3c5452 100644
--- a/oox/source/ole/vbainputstream.cxx
+++ b/oox/source/ole/vbainputstream.cxx
@@ -157,7 +157,7 @@ bool VbaInputStream::updateChunk()
                     sal_uInt16 nCopyToken = mpInStrm->readuInt16();
                     nChunkPos = nChunkPos + 2;
                     // update bit count used for offset/length in the token
-                    while( static_cast< size_t >( 1 << nBitCount ) < maChunk.size() ) ++nBitCount;
+                    while( ((static_cast<size_t>(1)) << nBitCount ) < maChunk.size() ) ++nBitCount;
                     // extract length from lower (16-nBitCount) bits, plus 3
                     sal_uInt16 nLength = extractValue< sal_uInt16 >( nCopyToken, 0, 16 - nBitCount ) + 3;
                     // extract offset from high nBitCount bits, plus 1
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 01060ab..e45df54 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -248,7 +248,7 @@ bool GIFReader::ReadGlobalHeader()
                 bGlobalPalette = ( nRF & 0x80 );
 
                 if( bGlobalPalette )
-                    ReadPaletteEntries( &aGPalette, 1 << ( ( nRF & 7 ) + 1 ) );
+                    ReadPaletteEntries( &aGPalette, 1UL << ( ( nRF & 7 ) + 1 ) );
                 else
                     nBackgroundColor = 0;
 
@@ -459,7 +459,7 @@ bool GIFReader::ReadLocalHeader()
         if( nFlags & 0x80 )
         {
             pPal = &aLPalette;
-            ReadPaletteEntries( pPal, 1 << ( (nFlags & 7 ) + 1 ) );
+            ReadPaletteEntries( pPal, 1UL << ( (nFlags & 7 ) + 1 ) );
         }
         else
             pPal = &aGPalette;