Kaydet (Commit) d40b0b46 authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz#3747 Invalid-bool-value

Change-Id: I168fc71471dc9aeb4cd5149aaab765e65f7d5a82
Reviewed-on: https://gerrit.libreoffice.org/43756Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst da09cf2c
......@@ -57,7 +57,6 @@ ImplWallpaper::~ImplWallpaper()
SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
{
VersionCompat aCompat( rIStm, StreamMode::READ );
sal_uInt16 nTmp16;
rImplWallpaper.mpRect.reset();
rImplWallpaper.mpGradient.reset();
......@@ -65,12 +64,14 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
// version 1
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
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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment