mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#3747 Invalid-bool-value

Browse Source 
Change-Id: I168fc71471dc9aeb4cd5149aaab765e65f7d5a82
Reviewed-on: https://gerrit.libreoffice.org/43756
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-10-24 12:01:22 +01:00
parent da09cf2cb8
commit d40b0b46ae
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vcl/source/gdi/wall.cxx
View File

@@ -57,7 +57,6 @@ ImplWallpaper::~ImplWallpaper()
SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
{ {
VersionCompat aCompat( rIStm, StreamMode::READ ); VersionCompat aCompat( rIStm, StreamMode::READ );
sal_uInt16 nTmp16;
rImplWallpaper.mpRect.reset(); rImplWallpaper.mpRect.reset();
rImplWallpaper.mpGradient.reset(); rImplWallpaper.mpGradient.reset();
@@ -65,12 +64,14 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
// version 1 // version 1
ReadColor( rIStm, rImplWallpaper.maColor ); ReadColor( rIStm, rImplWallpaper.maColor );
rIStm.ReadUInt16( nTmp16 ); rImplWallpaper.meStyle = (WallpaperStyle) nTmp16; sal_uInt16 nTmp16(0);
rIStm.ReadUInt16(nTmp16);
rImplWallpaper.meStyle = static_cast<WallpaperStyle>(nTmp16);
// version 2 // version 2
if( aCompat.GetVersion() >= 2 ) if( aCompat.GetVersion() >= 2 )
{ {
bool bRect, bGrad, bBmp, bDummy; bool bRect(false), bGrad(false), bBmp(false), bDummy;
rIStm.ReadCharAsBool( bRect ).ReadCharAsBool( bGrad ).ReadCharAsBool( bBmp ).ReadCharAsBool( bDummy ).ReadCharAsBool( bDummy ).ReadCharAsBool( bDummy ); rIStm.ReadCharAsBool( bRect ).ReadCharAsBool( bGrad ).ReadCharAsBool( bBmp ).ReadCharAsBool( bDummy ).ReadCharAsBool( bDummy ).ReadCharAsBool( bDummy );