Kaydet (Commit) 9b77b33a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:implicitboolconversion clean-up

Change-Id: I10d50f76dff5d5e456b28393c48b4de21201779b
üst 12685fe6
...@@ -74,7 +74,7 @@ StgHeader::StgHeader() ...@@ -74,7 +74,7 @@ StgHeader::StgHeader()
, nByteOrder( 0 ) , nByteOrder( 0 )
, nPageSize( 0 ) , nPageSize( 0 )
, nDataPageSize( 0 ) , nDataPageSize( 0 )
, bDirty( 0 ) , bDirty( sal_uInt8(false) )
, nFATSize( 0 ) , nFATSize( 0 )
, nTOCstrm( 0 ) , nTOCstrm( 0 )
, nReserved( 0 ) , nReserved( 0 )
...@@ -98,7 +98,7 @@ void StgHeader::Init() ...@@ -98,7 +98,7 @@ void StgHeader::Init()
nByteOrder = 0xFFFE; nByteOrder = 0xFFFE;
nPageSize = 9; // 512 bytes nPageSize = 9; // 512 bytes
nDataPageSize = 6; // 64 bytes nDataPageSize = 6; // 64 bytes
bDirty = 0; bDirty = sal_uInt8(false);
memset( cReserved, 0, sizeof( cReserved ) ); memset( cReserved, 0, sizeof( cReserved ) );
nFATSize = 0; nFATSize = 0;
nTOCstrm = 0; nTOCstrm = 0;
...@@ -175,7 +175,7 @@ bool StgHeader::Store( StgIo& rIo ) ...@@ -175,7 +175,7 @@ bool StgHeader::Store( StgIo& rIo )
.WriteInt32( nMaster ); // 48 # of additional master blocks .WriteInt32( nMaster ); // 48 # of additional master blocks
for( short i = 0; i < cFATPagesInHeader; i++ ) for( short i = 0; i < cFATPagesInHeader; i++ )
r.WriteInt32( nMasterFAT[ i ] ); r.WriteInt32( nMasterFAT[ i ] );
bDirty = !rIo.Good(); bDirty = sal_uInt8(!rIo.Good());
return !bDirty; return !bDirty;
} }
...@@ -221,39 +221,39 @@ void StgHeader::SetFATPage( short n, sal_Int32 nb ) ...@@ -221,39 +221,39 @@ void StgHeader::SetFATPage( short n, sal_Int32 nb )
if( n >= 0 && n < cFATPagesInHeader ) if( n >= 0 && n < cFATPagesInHeader )
{ {
if( nMasterFAT[ n ] != nb ) if( nMasterFAT[ n ] != nb )
bDirty = sal_True, nMasterFAT[ n ] = nb; bDirty = sal_uInt8(true), nMasterFAT[ n ] = nb;
} }
} }
void StgHeader::SetTOCStart( sal_Int32 n ) void StgHeader::SetTOCStart( sal_Int32 n )
{ {
if( n != nTOCstrm ) bDirty = sal_True, nTOCstrm = n; if( n != nTOCstrm ) bDirty = sal_uInt8(true), nTOCstrm = n;
} }
void StgHeader::SetDataFATStart( sal_Int32 n ) void StgHeader::SetDataFATStart( sal_Int32 n )
{ {
if( n != nDataFAT ) bDirty = sal_True, nDataFAT = n; if( n != nDataFAT ) bDirty = sal_uInt8(true), nDataFAT = n;
} }
void StgHeader::SetDataFATSize( sal_Int32 n ) void StgHeader::SetDataFATSize( sal_Int32 n )
{ {
if( n != nDataFATSize ) bDirty = sal_True, nDataFATSize = n; if( n != nDataFATSize ) bDirty = sal_uInt8(true), nDataFATSize = n;
} }
void StgHeader::SetFATSize( sal_Int32 n ) void StgHeader::SetFATSize( sal_Int32 n )
{ {
if( n != nFATSize ) bDirty = sal_True, nFATSize = n; if( n != nFATSize ) bDirty = sal_uInt8(true), nFATSize = n;
} }
void StgHeader::SetFATChain( sal_Int32 n ) void StgHeader::SetFATChain( sal_Int32 n )
{ {
if( n != nMasterChain ) if( n != nMasterChain )
bDirty = sal_True, nMasterChain = n; bDirty = sal_uInt8(true), nMasterChain = n;
} }
void StgHeader::SetMasters( sal_Int32 n ) void StgHeader::SetMasters( sal_Int32 n )
{ {
if( n != nMaster ) bDirty = sal_True, nMaster = n; if( n != nMaster ) bDirty = sal_uInt8(true), nMaster = n;
} }
///////////////////////////// class StgEntry ///////////////////////////// class StgEntry
......
...@@ -41,7 +41,9 @@ class StgHeader ...@@ -41,7 +41,9 @@ class StgHeader
sal_uInt16 nByteOrder; // 1C Unicode byte order indicator sal_uInt16 nByteOrder; // 1C Unicode byte order indicator
sal_Int16 nPageSize; // 1E 1 << nPageSize = block size sal_Int16 nPageSize; // 1E 1 << nPageSize = block size
sal_Int16 nDataPageSize; // 20 1 << this size == data block size sal_Int16 nDataPageSize; // 20 1 << this size == data block size
sal_uInt8 bDirty; // 22 internal dirty flag sal_uInt8 bDirty; // 22 internal dirty flag (should be
// bool, but probably required to
// be exactly one byte)
sal_uInt8 cReserved[ 9 ]; // 23 sal_uInt8 cReserved[ 9 ]; // 23
sal_Int32 nFATSize; // 2C total number of FAT pages sal_Int32 nFATSize; // 2C total number of FAT pages
sal_Int32 nTOCstrm; // 30 starting page for the TOC stream sal_Int32 nTOCstrm; // 30 starting page for the TOC stream
......
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