diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:26:54 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:26:54 +0100 |
commit | 9abbe475a491631d77199a511382b39b748926a0 (patch) | |
tree | bd0600aa975d1db58370da2a7562f8035b96358c /rsc/source/res/rscflag.cxx | |
parent | debuglevels: silence WaE with uncmaxci.pro+debug (diff) | |
parent | DEV300 masterfix: #i116814,i116838#: fix XCloneable so that tests work again (diff) | |
download | core-9abbe475a491631d77199a511382b39b748926a0.tar.gz core-9abbe475a491631d77199a511382b39b748926a0.zip |
debuglevels: pulled and merged DEV300.m100
Diffstat (limited to 'rsc/source/res/rscflag.cxx')
-rw-r--r-- | rsc/source/res/rscflag.cxx | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx index e742b806408e..48c583a3ff8e 100644 --- a/rsc/source/res/rscflag.cxx +++ b/rsc/source/res/rscflag.cxx @@ -100,7 +100,7 @@ ERRTYPE RscFlag::SetNotConst( const RSCINST & rInst, Atom nConst ) |* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ -ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, INT32 /*nVal*/ ) +ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ ) { sal_uInt32 i = 0, nFlag = 0; @@ -147,7 +147,7 @@ RSCINST RscFlag::CreateBasic( RSCINST * pInst ) |* Letzte Aenderung MM 16.01.92 |* *************************************************************************/ -RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ) +RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) { RSCINST aInst = CreateBasic( pInst ); sal_uInt32 i = 0; @@ -179,7 +179,7 @@ RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass |* *************************************************************************/ RSCINST RscFlag::CreateClient( RSCINST * pInst, const RSCINST & rDfltI, - BOOL bOwnClass, Atom nConstId ) + sal_Bool bOwnClass, Atom nConstId ) { RSCINST aInst = CreateBasic( pInst ); sal_uInt32 i = 0, nFlag = 0; @@ -231,17 +231,17 @@ void RscFlag::SetToDefault( const RSCINST & rInst ) |* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ -BOOL RscFlag::IsDefault( const RSCINST & rInst ) +sal_Bool RscFlag::IsDefault( const RSCINST & rInst ) { sal_uInt32 i = 0; for( i = 0; i < Size() / sizeof( RscFlagInst ); i++ ) if( ((RscFlagInst *)rInst.pData)[ i ].nDfltFlags != 0xFFFFFFFF ) - return( FALSE ); - return( TRUE ); + return( sal_False ); + return( sal_True ); } -BOOL RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId ) +sal_Bool RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId ) { sal_uInt32 i = 0, nFlag = 0; @@ -249,11 +249,11 @@ BOOL RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId ) nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) ); i = i / (sizeof( sal_uInt32 ) * 8); if( ((RscFlagInst *)rInst.pData)[ i ].nDfltFlags & nFlag ) - return( TRUE ); + return( sal_True ); else - return( FALSE ); + return( sal_False ); }; - return( TRUE ); + return( sal_True ); } /************************************************************************* @@ -265,7 +265,7 @@ BOOL RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId ) |* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ -BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef, +sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef, Atom nConstId ) { sal_uInt32 i = 0, nFlag = 0; @@ -278,15 +278,15 @@ BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef, if( (((RscFlagInst *)rInst.pData)[ i ].nFlags & nFlag) == (((RscFlagInst *)pDef)[ i ].nFlags & nFlag) ) { - return TRUE; + return sal_True; } } }; - return FALSE; + return sal_False; } -BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) +sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { sal_uInt32 i = 0; @@ -299,7 +299,7 @@ BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) if( (((RscFlagInst *)rInst.pData)[ nIndex ].nFlags & Flag) != (((RscFlagInst *)pDef)[ nIndex ].nFlags & Flag) ) { - return FALSE; + return sal_False; } Flag <<= 1; if( !Flag ) @@ -307,9 +307,9 @@ BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) }; } else - return FALSE; + return sal_False; - return TRUE; + return sal_True; } /************************************************************************* @@ -321,7 +321,7 @@ BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) |* Letzte Aenderung MM 10.04.91 |* *************************************************************************/ -BOOL RscFlag::IsSet( const RSCINST & rInst, Atom nConstId ) +sal_Bool RscFlag::IsSet( const RSCINST & rInst, Atom nConstId ) { sal_uInt32 i = 0, nFlag = 0; @@ -329,11 +329,11 @@ BOOL RscFlag::IsSet( const RSCINST & rInst, Atom nConstId ) nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) ); i = i / (sizeof( sal_uInt32 ) * 8); if( ((RscFlagInst *)rInst.pData)[ i ].nFlags & nFlag ) - return( TRUE ); + return( sal_True ); else - return( FALSE ); + return( sal_False ); }; - return( TRUE ); + return( sal_True ); } /************************************************************************* @@ -349,7 +349,7 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { sal_uInt32 i = 0, Flag = 0, nIndex = 0; - BOOL bComma = FALSE; + sal_Bool bComma = sal_False; Flag = 1; for( i = 0; i < nEntries; i++ ){ @@ -363,7 +363,7 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput, fprintf( fOutput, "not " ); fprintf( fOutput, "%s", pHS->getString( pVarArray[ i ].nId ).getStr() ); } - bComma = TRUE; + bComma = sal_True; } Flag <<= 1; if( !Flag ) @@ -381,9 +381,9 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont *, sal_uInt32, BOOL ) + RscTypCont *, sal_uInt32, sal_Bool ) { - INT32 lVal = 0; + sal_Int32 lVal = 0; sal_uInt32 i = 0, Flag = 0, nIndex = 0; Flag = 1; @@ -397,7 +397,7 @@ ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, Flag = 1; }; - aMem.Put( (INT32)lVal ); + aMem.Put( (sal_Int32)lVal ); return( ERR_OK ); } @@ -460,7 +460,7 @@ void RscClient::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ RSCINST RscClient::Create( RSCINST * pInst, const RSCINST & rDflt, - BOOL bOwnClass ) + sal_Bool bOwnClass ) { RSCINST aTmpI, aDfltI; |