diff options
author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-08-14 12:40:36 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-19 16:38:47 +0100 |
commit | b751e3915ef527c9af07b995c95fb353c3c81a42 (patch) | |
tree | 13253618d7fd058a8465177d3767a3c338cb3ab3 /sot/source/sdstor/stgelem.cxx | |
parent | d0a956f1d80aaf4be6d19d339bd46addc8c16861 (diff) |
some refactoring on <StgHeader>
(cherry picked from commit 9c3ef4ee67c1d3f416c02b9db6d1adbc7ca6d549)
Conflicts:
sot/source/sdstor/stgelem.cxx
Change-Id: I3f826dc98af5ad5cee5c2566006ab405f0730c3c
Diffstat (limited to 'sot/source/sdstor/stgelem.cxx')
-rw-r--r-- | sot/source/sdstor/stgelem.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 265381e0c257..e34f0689f588 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -110,7 +110,7 @@ void StgHeader::Init() SetTOCStart( STG_EOF ); SetDataFATStart( STG_EOF ); - for( short i = 0; i < 109; i++ ) + for( short i = 0; i < cFATPagesInHeader; i++ ) SetFATPage( i, STG_FREE ); } @@ -145,7 +145,7 @@ sal_Bool StgHeader::Load( SvStream& r ) >> nDataFATSize // 40 # of data FATpages >> nMasterChain // 44 chain to the next master block >> nMaster; // 48 # of additional master blocks - for( short i = 0; i < 109; i++ ) + for( short i = 0; i < cFATPagesInHeader; i++ ) r >> nMasterFAT[ i ]; return ( r.GetErrorCode() == ERRCODE_NONE && Check() ); @@ -172,7 +172,7 @@ sal_Bool StgHeader::Store( StgIo& rIo ) << nDataFATSize // 40 # of data FAT pages << nMasterChain // 44 chain to the next master block << nMaster; // 48 # of additional master blocks - for( short i = 0; i < 109; i++ ) + for( short i = 0; i < cFATPagesInHeader; i++ ) r << nMasterFAT[ i ]; bDirty = !rIo.Good(); return sal_Bool( !bDirty ); @@ -209,7 +209,7 @@ sal_Bool StgHeader::Check() sal_Int32 StgHeader::GetFATPage( short n ) const { - if( n >= 0 && n < 109 ) + if( n >= 0 && n < cFATPagesInHeader ) return nMasterFAT[ n ]; else return STG_EOF; @@ -217,7 +217,7 @@ sal_Int32 StgHeader::GetFATPage( short n ) const void StgHeader::SetFATPage( short n, sal_Int32 nb ) { - if( n >= 0 && n < 109 ) + if( n >= 0 && n < cFATPagesInHeader ) { if( nMasterFAT[ n ] != nb ) bDirty = sal_True, nMasterFAT[ n ] = nb; |