diff options
Diffstat (limited to 'rsc/source/parser/rscdb.cxx')
-rw-r--r-- | rsc/source/parser/rscdb.cxx | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index af176fe24934..51df773ef182 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -65,9 +65,9 @@ RscTypCont :: RscTypCont( RscError * pErrHdl, nSourceCharSet( RTL_TEXTENCODING_UTF8 ), nByteOrder( nOrder ), aSearchPath( rSearchPath ), - aBool( pHS->getID( "BOOL" ), RSC_NOTYPE ), + aBool( pHS->getID( "sal_Bool" ), RSC_NOTYPE ), aShort( pHS->getID( "short" ), RSC_NOTYPE ), - aUShort( pHS->getID( "USHORT" ), RSC_NOTYPE ), + aUShort( pHS->getID( "sal_uInt16" ), RSC_NOTYPE ), aLong( pHS->getID( "long" ), RSC_NOTYPE ), aEnumLong( pHS->getID( "enum_long" ), RSC_NOTYPE ), aIdUShort( pHS->getID( "IDUSHORT" ), RSC_NOTYPE ), @@ -394,16 +394,16 @@ void RscTypCont :: Delete( Atom nRT, const RscId & rId ){ |* *************************************************************************/ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName, - sal_uInt32 nConst, sal_uInt32 nId, BOOL bFirst ) + sal_uInt32 nConst, sal_uInt32 nId, sal_Bool bFirst ) { RscSysEntry * pSysEntry; - BOOL bId1 = FALSE; + sal_Bool bId1 = sal_False; pSysEntry = aSysLst.First(); while( pSysEntry ) { if( pSysEntry->nKey == 1 ) - bId1 = TRUE; + bId1 = sal_True; if( !strcmp( pSysEntry->aFileName.GetBuffer(), pFileName ) ) if( pSysEntry->nRscTyp == nRscTyp && pSysEntry->nTyp == nConst @@ -423,7 +423,7 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName, if( bFirst && !bId1 ) { pSysEntry->nKey = 1; - aSysLst.Insert( pSysEntry, (ULONG)0 ); + aSysLst.Insert( pSysEntry, (sal_uLong)0 ); } else aSysLst.Insert( pSysEntry, LIST_APPEND ); @@ -441,7 +441,7 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName, |* Letzte Aenderung MM 21.06.90 |* *************************************************************************/ -void RscTypCont :: WriteInc( FILE * fOutput, ULONG lFileKey ) +void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey ) { RscFile * pFName; @@ -503,7 +503,7 @@ private: ERRTYPE aError; // Enthaelt den ersten Fehler RscTypCont* pTypCont; FILE * fOutput; // AusgabeDatei - ULONG lFileKey; // Welche src-Datei + sal_uLong lFileKey; // Welche src-Datei RscTop * pClass; DECL_LINK( CallBackWriteRc, ObjNode * ); @@ -555,7 +555,7 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode ) aError = pClass->WriteRcHeader( RSCINST( pClass, pObjNode->GetRscObj() ), aMem, pTypCont, - pObjNode->GetRscId(), 0, TRUE ); + pObjNode->GetRscId(), 0, sal_True ); if( aError.IsError() || aError.IsWarning() ) pTypCont->pEH->Error( aError, pClass, pObjNode->GetRscId() ); @@ -650,18 +650,18 @@ void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut ){ if( nRT == RSC_VERSIONCONTROL ) { // kommt immmer als letztes - INT32 nCount = pTypCont->aIdTranslator.size(); + sal_Int32 nCount = pTypCont->aIdTranslator.size(); // groesse der Tabelle - UINT32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(INT32))) + sizeof(INT32); + sal_uInt32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(sal_Int32))) + sizeof(sal_Int32); rMem.Put( nCount ); //Anzahl speichern - for( std::map< sal_uInt64, ULONG >::const_iterator it = + for( std::map< sal_uInt64, sal_uLong >::const_iterator it = pTypCont->aIdTranslator.begin(); it != pTypCont->aIdTranslator.end(); ++it ) { // Schluessel schreiben rMem.Put( it->first ); // Objekt Id oder Position schreiben - rMem.Put( (INT32)it->second ); + rMem.Put( (sal_Int32)it->second ); } rMem.Put( nSize ); // Groesse hinten Speichern } @@ -703,7 +703,7 @@ public: return aEnumObj.aError; }; - ERRTYPE WriteSrc( ULONG lFileKey ) + ERRTYPE WriteSrc( sal_uLong lFileKey ) { aEnumObj.lFileKey = lFileKey; @@ -712,7 +712,7 @@ public: return aEnumObj.aError; } - ERRTYPE WriteCxx( ULONG lFileKey ) + ERRTYPE WriteCxx( sal_uLong lFileKey ) { aEnumObj.lFileKey = lFileKey; @@ -721,7 +721,7 @@ public: return aEnumObj.aError; } - ERRTYPE WriteHxx( ULONG lFileKey ) + ERRTYPE WriteHxx( sal_uLong lFileKey ) { aEnumObj.lFileKey = lFileKey; @@ -814,7 +814,7 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) // version control RscWriteRc aMem( nByteOrder ); - aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, TRUE ); + aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, sal_True ); aEnumRef.aEnumObj.WriteRcFile( aMem, rContext.fOutput ); return aError; @@ -829,8 +829,8 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) |* Letzte Aenderung MM 27.06.90 |* *************************************************************************/ -void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey, - CharSet /*nCharSet*/, BOOL bName ) +void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey, + CharSet /*nCharSet*/, sal_Bool bName ) { RscFile * pFName; RscEnumerateRef aEnumRef( this, pRoot, fOutput ); @@ -862,7 +862,7 @@ void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey, } else { - RscId::SetNames( FALSE ); + RscId::SetNames( sal_False ); if( NOFILE_INDEX == nFileKey ) { pFName = aFileTab.First(); @@ -887,7 +887,7 @@ void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey, |* Letzte Aenderung MM 30.05.91 |* *************************************************************************/ -ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey ) +ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, sal_uLong nFileKey ) { fprintf( fOutput, "#include <tools/rc.hxx>\n" ); fprintf( fOutput, "#include <tools/resid.hxx>\n" ); @@ -953,7 +953,7 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey ) |* Letzte Aenderung MM 30.05.91 |* *************************************************************************/ -ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey, +ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, sal_uLong nFileKey, const ByteString & rHxxName ) { RscEnumerateRef aEnumRef( this, pRoot, fOutput ); @@ -1019,14 +1019,14 @@ void RscTypCont::WriteRcCtor *************************************************************************/ class RscDel { - ULONG lFileKey; + sal_uLong lFileKey; DECL_LINK( Delete, RscTop * ); public: - RscDel( RscTop * pRoot, ULONG lKey ); + RscDel( RscTop * pRoot, sal_uLong lKey ); }; -inline RscDel::RscDel( RscTop * pRoot, ULONG lKey ) +inline RscDel::RscDel( RscTop * pRoot, sal_uLong lKey ) { lFileKey = lKey; pRoot->EnumNodes( LINK( this, RscDel, Delete ) ); @@ -1040,7 +1040,7 @@ IMPL_LINK_INLINE_START( RscDel, Delete, RscTop *, pNode ) } IMPL_LINK_INLINE_END( RscDel, Delete, RscTop *, pNode ) -void RscTypCont :: Delete( ULONG lFileKey ){ +void RscTypCont :: Delete( sal_uLong lFileKey ){ // Resourceinstanzen loeschen RscDel aDel( pRoot, lFileKey ); // Defines loeschen @@ -1056,55 +1056,55 @@ void RscTypCont :: Delete( ULONG lFileKey ){ |* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ -BOOL IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop, +sal_Bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop, RscInconsList * pList ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if( pObjNode ){ RSCINST aTmpI; if( ! IsInstConsistent( (ObjNode*)pObjNode->Left(), pRscTop, pList ) ) - bRet = FALSE; + bRet = sal_False; aTmpI.pClass = pRscTop; aTmpI.pData = pObjNode->GetRscObj(); if( ! aTmpI.pClass->IsConsistent( aTmpI, pList ) ) - bRet = FALSE; + bRet = sal_False; if( ! IsInstConsistent( (ObjNode*)pObjNode->Right(), pRscTop, pList ) ) - bRet = FALSE; + bRet = sal_False; }; return( bRet ); } -BOOL MakeConsistent( RscTop * pRscTop, RscInconsList * pList ) +sal_Bool MakeConsistent( RscTop * pRscTop, RscInconsList * pList ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if( pRscTop ){ if( ! ::MakeConsistent( (RscTop*)pRscTop->Left(), pList ) ) - bRet = FALSE; + bRet = sal_False; if( pRscTop->GetObjNode() ){ if( ! pRscTop->GetObjNode()->IsConsistent() ){ pRscTop->GetObjNode()->OrderTree(); if( ! pRscTop->GetObjNode()->IsConsistent( pList ) ) - bRet = FALSE; + bRet = sal_False; } if( ! IsInstConsistent( pRscTop->GetObjNode(), pRscTop, pList ) ) - bRet = FALSE; + bRet = sal_False; } if( ! ::MakeConsistent( (RscTop*)pRscTop->Right(), pList ) ) - bRet = FALSE; + bRet = sal_False; }; return bRet; } -BOOL RscTypCont :: MakeConsistent( RscInconsList * pList ){ +sal_Bool RscTypCont :: MakeConsistent( RscInconsList * pList ){ return( ::MakeConsistent( pRoot, pList ) ); } |