diff options
| author | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2011-02-23 21:03:15 +0100 |
|---|---|---|
| committer | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2011-02-23 21:03:15 +0100 |
| commit | 357be60a222004778ffbdc0743a4407875f3ac97 (patch) | |
| tree | 79a9c1d74dc012cb6b110770f2a5e0d5132c791e /rsc | |
| parent | bb89febae6cb26c0a6aa121882c4a05d462c7bf7 (diff) | |
| parent | e2a3d487efb2bd5e582eb10e4150530c3f7377c5 (diff) | |
Update from master repository (DEV300_m100).
Diffstat (limited to 'rsc')
50 files changed, 935 insertions, 935 deletions
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h index e556758054b8..4a1b20663904 100644 --- a/rsc/inc/rscall.h +++ b/rsc/inc/rscall.h @@ -95,7 +95,7 @@ struct RSCINST { pClass = pCl; pData = pClassData; } - BOOL IsInst() const { return( pData != NULL ); } + sal_Bool IsInst() const { return( pData != NULL ); } }; /********************** S U B I N F O S T R U C T ************************/ diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx index e47c11e03777..6a5ebb934dc2 100644 --- a/rsc/inc/rscarray.hxx +++ b/rsc/inc/rscarray.hxx @@ -80,9 +80,9 @@ public: pTypeClass = pClass; } virtual RscTop * GetTypeClass() const; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool ); void Destroy( const RSCINST & rInst ); - virtual ERRTYPE GetValueEle( const RSCINST & rInst, INT32 lValue, + virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue, RscTop * pCreateClass, RSCINST * pGetInst ); virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId, @@ -92,10 +92,10 @@ public: // Gibt die Groesse der Klasse in Bytes sal_uInt32 Size(){ return( nSize ); }; - BOOL IsConsistent( const RSCINST & rInst, RscInconsList * pList ); + sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList ); virtual void SetToDefault( const RSCINST & rInst ); - BOOL IsDefault( const RSCINST & rInst ); - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + sal_Bool IsDefault( const RSCINST & rInst ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, @@ -103,7 +103,7 @@ public: void WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, const char * ); }; @@ -121,7 +121,7 @@ public: RscTypCont * pTC, sal_uInt32 nTab, const char * ); virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, const RscId & aId, - sal_uInt32 nDeep, BOOL bExtra ); + sal_uInt32 nDeep, sal_Bool bExtra ); }; diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index 67cc59628fd0..e849a9969d07 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -37,7 +37,7 @@ class RscClass : public RscTop { protected: struct RscClassInst{ - ULONG nVarDflt; + sal_uLong nVarDflt; }; struct VARTYPE_STRUCT { Atom nVarName; // Variablenname @@ -54,13 +54,13 @@ protected: sal_uInt32 nEntries; // Eintraege in pVarTypeList VARTYPE_STRUCT * pVarTypeList; // Variablenliste RSCINST GetInstData( CLASS_DATA pData, sal_uInt32 nEle, - BOOL bGetCopy = FALSE ); + sal_Bool bGetCopy = sal_False ); CLASS_DATA GetDfltData( sal_uInt32 nEle ); - BOOL IsDflt( CLASS_DATA pData, sal_uInt32 nEle ); - BOOL IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ); + sal_Bool IsDflt( CLASS_DATA pData, sal_uInt32 nEle ); + sal_Bool IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ); void SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, - BOOL bSet ); - INT32 GetCorrectValues( const RSCINST & rInst, sal_uInt32 nVarPos, + sal_Bool bSet ); + sal_Int32 GetCorrectValues( const RSCINST & rInst, sal_uInt32 nVarPos, sal_uInt32 nTupelIdx, RscTypCont * pTC ); public: RscClass( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl ); @@ -76,29 +76,29 @@ public: virtual void EnumVariables( void * pData, VarEnumCallbackProc ); RSCINST GetVariable( const RSCINST & rInst, Atom nVarName, const RSCINST & rInitInst, - BOOL nInitDflt = FALSE, + sal_Bool nInitDflt = sal_False, RscTop * pCreateClass = NULL ); RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName ); // Gibt die Groesse der Klasse in Bytes sal_uInt32 Size(){ return( nSize ); }; - BOOL IsConsistent( const RSCINST & rInst, RscInconsList * pList ); + sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList ); void SetToDefault( const RSCINST & rInst ); - BOOL IsDefault( const RSCINST & rInst ); - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + sal_Bool IsDefault( const RSCINST & rInst ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); void SetDefault( const RSCINST & rData, Atom nVarId ); using RscTop::GetDefault; RSCINST GetDefault( Atom nVarId ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool ); void Destroy( const RSCINST & rInst ); void WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteInstRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); void WriteSyntax( FILE * fOutput, RscTypCont * pTC ); void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, @@ -111,10 +111,10 @@ class RscSysDepend : public RscClass public: RscSysDepend( Atom nId, sal_uInt32 nTypId, RscTop * pSuper ); ERRTYPE WriteSysDependRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra, - BOOL bFirst = FALSE ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra, + sal_Bool bFirst = sal_False ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); }; class RscFirstSysDepend : public RscSysDepend @@ -123,7 +123,7 @@ public: RscFirstSysDepend( Atom nId, sal_uInt32 nTypId, RscTop * pSuper ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); }; class RscTupel : public RscClass diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx index 34bc38350399..75277813a8cb 100644 --- a/rsc/inc/rscclobj.hxx +++ b/rsc/inc/rscclobj.hxx @@ -51,23 +51,23 @@ DECLARE_LIST( RscInconsList, RscInconsistent * ) class ObjNode : public IdNode{ RscId aRscId; // Id der Resource CLASS_DATA pRscObj;// pointer to a resourceobject - ULONG lFileKey;// Dateischluessel + sal_uLong lFileKey;// Dateischluessel protected: using NameNode::Search; public: using NameNode::Insert; - ObjNode( const RscId & rId, CLASS_DATA pData, ULONG lKey ); - ObjNode * DelObjNode( RscTop * pClass, ULONG lFileKey ); + ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey ); + ObjNode * DelObjNode( RscTop * pClass, sal_uLong lFileKey ); sal_uInt32 GetId() const; RscId GetRscId(){ return( aRscId ); } - ULONG GetFileKey(){ return lFileKey; }; + sal_uLong GetFileKey(){ return lFileKey; }; ObjNode* Search( const RscId &rName ) const{ // search the index in the b-tree return( (ObjNode *)IdNode::Search( rName ) ); } - BOOL Insert( ObjNode* pTN ){ + sal_Bool Insert( ObjNode* pTN ){ // insert a new node in the b-tree return( IdNode::Insert( (IdNode *)pTN ) ); } @@ -75,7 +75,7 @@ public: // get the Object from this Node return( pRscObj ); } - BOOL IsConsistent( RscInconsList * pList = NULL ); + sal_Bool IsConsistent( RscInconsList * pList = NULL ); }; /******************* R e f N o d e ***************************************/ @@ -94,11 +94,11 @@ public: // search the index in the b-tree return( (RefNode *)IdNode::Search( typ ) ); }; - BOOL Insert( RefNode* pTN ){ + sal_Bool Insert( RefNode* pTN ){ // insert a new node in the b-tree return( IdNode::Insert( (IdNode *)pTN ) ); }; - BOOL PutObjNode( ObjNode * pPutObject ); + sal_Bool PutObjNode( ObjNode * pPutObject ); // insert new node in b-tree pObjBiTree ObjNode * GetObjNode( const RscId &rRscId ); diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx index 70612310fbab..a48ec3c05ab3 100644 --- a/rsc/inc/rscconst.hxx +++ b/rsc/inc/rscconst.hxx @@ -38,7 +38,7 @@ class RscConst : public RscTop protected: struct VarEle { Atom nId; // Name der Konstante - INT32 lValue; // Wert der Konstante + sal_Int32 lValue; // Wert der Konstante }; VarEle * pVarArray; // Zeiger auf das Feld mit Konstanten sal_uInt32 nEntries; // Anzahle der Eintraege im Feld @@ -48,10 +48,10 @@ public: virtual RSCCLASS_TYPE GetClassType() const; sal_uInt32 GetEntryCount() const { return nEntries; } // Die erlaubten Werte werden gesetzt - ERRTYPE SetConstant( Atom nVarName, INT32 lValue ); + ERRTYPE SetConstant( Atom nVarName, sal_Int32 lValue ); Atom GetConstant( sal_uInt32 nPos ); - BOOL GetConstValue( Atom nConstId, INT32 * pVal ) const; - BOOL GetValueConst( INT32 nValue, Atom * pConstId ) const; + sal_Bool GetConstValue( Atom nConstId, sal_Int32 * pVal ) const; + sal_Bool GetValueConst( sal_Int32 nValue, Atom * pConstId ) const; sal_uInt32 GetConstPos( Atom nConstId ); virtual void WriteSyntax( FILE * fOutput, RscTypCont * pTC ); virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, @@ -62,34 +62,34 @@ public: class RscEnum : public RscConst { struct RscEnumInst { sal_uInt32 nValue; // Position der Konstanten im Array - BOOL bDflt; // Ist Default + sal_Bool bDflt; // Ist Default }; sal_uInt32 nSize; public: RscEnum( Atom nId, sal_uInt32 nTypId ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool ); sal_uInt32 Size(){ return nSize; } virtual void SetToDefault( const RSCINST & rInst ) { - ((RscEnumInst*)rInst.pData)->bDflt = TRUE; + ((RscEnumInst*)rInst.pData)->bDflt = sal_True; } - BOOL IsDefault( const RSCINST & rInst ) + sal_Bool IsDefault( const RSCINST & rInst ) { return( ((RscEnumInst*)rInst.pData)->bDflt ); }; // Als Default setzen - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - INT32 nValue ); - ERRTYPE SetNumber( const RSCINST & rInst, INT32 nValue ); + sal_Int32 nValue ); + ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 nValue ); ERRTYPE GetConst( const RSCINST & rInst, Atom * ); - ERRTYPE GetNumber( const RSCINST & rInst, INT32 * nValue ); + ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * nValue ); void WriteSrc( const RSCINST &rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); }; class RscNameTable; diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx index 49d2600d91df..668a40e0508e 100644 --- a/rsc/inc/rsccont.hxx +++ b/rsc/inc/rsccont.hxx @@ -41,7 +41,7 @@ struct ENTRY_STRUCT { struct RscBaseContInst { sal_uInt32 nEntries; ENTRY_STRUCT * pEntries; - BOOL bDflt; + sal_Bool bDflt; }; class RscBaseCont : public RscTop @@ -49,7 +49,7 @@ class RscBaseCont : public RscTop protected: RscTop * pTypeClass; // Typ der Eintraege RscTop * pTypeClass1;// Zwei verschiedene Typen moeglich - BOOL bNoId; // Keine Identifier + sal_Bool bNoId; // Keine Identifier sal_uInt32 nSize; // Groesse der Instanzdaten dieser Klasse // mit Superklassen sal_uInt32 nOffInstData;// Offset auf eigen Instanzdaten @@ -60,13 +60,13 @@ protected: void ContWriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE ContWriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); void ContWriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char *, BOOL nWriteSize ); + const char *, sal_Bool nWriteSize ); public: RscBaseCont( Atom nId, sal_uInt32 nTypId, RscTop * pSuper = NULL, - BOOL bNoId = TRUE ); + sal_Bool bNoId = sal_True ); ~RscBaseCont(); virtual RSCCLASS_TYPE GetClassType() const; void SetTypeClass( RscTop * pClass, RscTop * pClass1 = NULL ) @@ -74,7 +74,7 @@ public: pTypeClass = pClass; pTypeClass1 = pClass1; }; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool ); void Destroy( const RSCINST & rInst ); ERRTYPE GetElement( const RSCINST & rInst, const RscId & rEleName, RscTop * pCreateClass, const RSCINST & rCreateInst, @@ -89,19 +89,19 @@ public: const RscId & rRscId); SUBINFO_STRUCT GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ); ERRTYPE SetString( const RSCINST &, const char * pStr ); - ERRTYPE SetNumber( const RSCINST &, INT32 lValue ); - ERRTYPE SetBool( const RSCINST & rInst, BOOL bValue ); + ERRTYPE SetNumber( const RSCINST &, sal_Int32 lValue ); + ERRTYPE SetBool( const RSCINST & rInst, sal_Bool bValue ); ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - INT32 nValue ); + sal_Int32 nValue ); ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ); // Gibt die Groesse der Klasse in Bytes sal_uInt32 Size(){ return( nSize ); }; - BOOL IsConsistent( const RSCINST & rInst, RscInconsList * pList ); + sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList ); void SetToDefault( const RSCINST & rInst ); - BOOL IsDefault( const RSCINST & rInst ); - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + sal_Bool IsDefault( const RSCINST & rInst ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); void Delete( const RSCINST & rInst, RscTop * pClass, const RscId & rId ); @@ -110,7 +110,7 @@ public: void WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 , BOOL bExtra); + RscTypCont * pTC, sal_uInt32 , sal_Bool bExtra); ERRTYPE WriteHxx( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ); ERRTYPE WriteCxx( const RSCINST & rInst, FILE * fOutput, @@ -123,7 +123,7 @@ class RscContWriteSrc : public RscBaseCont public: RscContWriteSrc( Atom nId, sal_uInt32 nTypId, RscTop * pSuper = NULL, - BOOL bNoId = TRUE ); + sal_Bool bNoId = sal_True ); void WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); }; @@ -133,9 +133,9 @@ class RscCont : public RscContWriteSrc { public: RscCont( Atom nId, sal_uInt32 nTypId, RscTop * pSuper = NULL, - BOOL bNoId = TRUE ); + sal_Bool bNoId = sal_True ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, const char * ); }; @@ -145,9 +145,9 @@ class RscContExtraData : public RscContWriteSrc { public: RscContExtraData( Atom nId, sal_uInt32 nTypId, RscTop * pSuper = NULL, - BOOL bNoId = TRUE ); + sal_Bool bNoId = sal_True ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); }; #endif //_RSCCONT_HXX diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index cbdf5a326a43..3e8b263a0399 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -79,7 +79,7 @@ class RscTypCont ByteString aSearchPath; // Suchen der Bitmap, Icon, Pointer ByteString aSysSearchPath; // aSearchPath plus language specific paths sal_uInt32 nUniqueId; // eindeutiger Id fuer Systemresourcen - ULONG nFilePos; // Position in der Datei ( MTF ) + sal_uLong nFilePos; // Position in der Datei ( MTF ) sal_uInt32 nPMId; // eindeutiger Id fuer PM-Rseourcefile // muss groesser als RSC_VERSIONCONTROL_ID sein RscTop * pRoot; // Zeiger auf die Wurzel vom Typenbaum @@ -145,8 +145,8 @@ class RscTypCont Atom nSysWinId; void Init(); // Initialisiert Klassen und Tabelle - void SETCONST( RscConst *, const char *, UINT32 ); - void SETCONST( RscConst *, Atom, UINT32 ); + void SETCONST( RscConst *, const char *, sal_uInt32 ); + void SETCONST( RscConst *, Atom, sal_uInt32 ); RscEnum * InitLangType(); RscEnum * InitFieldUnitsType(); RscEnum * InitTimeFieldFormat(); @@ -265,7 +265,7 @@ class RscTypCont void InsWinBit( RscTop * pClass, const ByteString & rName, Atom nVal ); - void WriteInc( FILE * fOutput, ULONG lKey ); + void WriteInc( FILE * fOutput, sal_uLong lKey ); public: RscBool aBool; @@ -296,7 +296,7 @@ public: RscNameTable aNmTb; // Tabelle fuer Namen RscFileTab aFileTab; // Tabelle der Dateinamen sal_uInt32 nFlags; - std::map<sal_uInt64, ULONG> aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu + std::map<sal_uInt64, sal_uLong> aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu //(unter PM), oder eine Dateiposition (MTF) RscTypCont( RscError *, RSCBYTEORDER_TYPE, const ByteString & rSearchPath, sal_uInt32 nFlags ); @@ -304,14 +304,14 @@ public: Atom AddLanguage( const char* ); - BOOL IsPreload() const - { return (nFlags & PRELOAD_FLAG) ? TRUE : FALSE; } - BOOL IsSmart() const - { return (nFlags & SMART_FLAG) ? TRUE : FALSE; } - BOOL IsSysResTest() const - { return (nFlags & NOSYSRESTEST_FLAG) ? FALSE : TRUE; } - BOOL IsSrsDefault() const - { return (nFlags & SRSDEFAULT_FLAG) ? TRUE : FALSE; } + sal_Bool IsPreload() const + { return (nFlags & PRELOAD_FLAG) ? sal_True : sal_False; } + sal_Bool IsSmart() const + { return (nFlags & SMART_FLAG) ? sal_True : sal_False; } + sal_Bool IsSysResTest() const + { return (nFlags & NOSYSRESTEST_FLAG) ? sal_False : sal_True; } + sal_Bool IsSrsDefault() const + { return (nFlags & SRSDEFAULT_FLAG) ? sal_True : sal_False; } ByteString ChangeLanguage( const ByteString& rNewLang ); const std::vector< sal_uInt32 >& GetFallbacks() const { return aLangFallbacks; } @@ -337,23 +337,23 @@ public: CLASS_DATA Search( Atom typ, const RscId & rId ); void Delete( Atom typ, const RscId & rId ); // loescht alle Resourceobjekte diese Datei - void Delete( ULONG lFileKey ); + void Delete( sal_uLong lFileKey ); RscTop * GetRoot() { return( pRoot ); }; sal_uInt32 PutSysName( sal_uInt32 nRscTyp, char * pName, sal_uInt32 nConst, - sal_uInt32 nId, BOOL bFirst ); + sal_uInt32 nId, sal_Bool bFirst ); void ClearSysNames(); ERRTYPE WriteRc( WriteRcContext& rContext ); - void WriteSrc( FILE * fOutput, ULONG nFileIndex, - CharSet nCharSet, BOOL bName = TRUE ); - ERRTYPE WriteHxx( FILE * fOutput, ULONG nFileKey); - ERRTYPE WriteCxx( FILE * fOutput, ULONG nFileKey, + void WriteSrc( FILE * fOutput, sal_uLong nFileIndex, + CharSet nCharSet, sal_Bool bName = sal_True ); + ERRTYPE WriteHxx( FILE * fOutput, sal_uLong nFileKey); + ERRTYPE WriteCxx( FILE * fOutput, sal_uLong nFileKey, const ByteString & rHxxName ); void WriteSyntax( FILE * fOutput ); void WriteRcCtor( FILE * fOutput ); - void FillNameIdList( REResourceList * pList, ULONG lFileKey ); - BOOL MakeConsistent( RscInconsList * pList ); + void FillNameIdList( REResourceList * pList, sal_uLong lFileKey ); + sal_Bool MakeConsistent( RscInconsList * pList ); sal_uInt32 PutTranslatorKey( sal_uInt64 nKey ); - void IncFilePos( ULONG nOffset ){ nFilePos += nOffset; } + void IncFilePos( sal_uLong nOffset ){ nFilePos += nOffset; } }; #endif diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index a21b03685325..8900c5708c99 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -56,37 +56,37 @@ public: } aExp; char cType; char cUnused; - BOOL IsNumber() const { return( RSCEXP_LONG == cType ); } - BOOL IsExpression()const { return( RSCEXP_EXP == cType ); } - BOOL IsDefinition()const { return( RSCEXP_DEF == cType ); } - BOOL IsNothing() const { return( RSCEXP_NOTHING == cType ); } - void SetLong( INT32 lValue ){ + sal_Bool IsNumber() const { return( RSCEXP_LONG == cType ); } + sal_Bool IsExpression()const { return( RSCEXP_EXP == cType ); } + sal_Bool IsDefinition()const { return( RSCEXP_DEF == cType ); } + sal_Bool IsNothing() const { return( RSCEXP_NOTHING == cType ); } + void SetLong( sal_Int32 lValue ){ aExp.aLong.nHi = (short)(lValue >> 16); aExp.aLong.nLo = (unsigned short)lValue; cType = RSCEXP_LONG; } - INT32 GetLong() const{ + sal_Int32 GetLong() const{ return aExp.aLong.nLo | - ((INT32)aExp.aLong.nHi << 16); + ((sal_Int32)aExp.aLong.nHi << 16); } - BOOL Evaluate( INT32 * pValue ) const; + sal_Bool Evaluate( sal_Int32 * pValue ) const; void GetMacro( ByteString & ) const; }; /*********** R s c I d ***************************************************/ class RscId { - static BOOL bNames;// FALSE, bei den Namenoperation nur Zahlen + static sal_Bool bNames;// sal_False, bei den Namenoperation nur Zahlen public: RscExpType aExp; // Zahl, Define oder Ausdruck - INT32 GetNumber() const; + sal_Int32 GetNumber() const; void Create( const RscExpType & rExpType ); void Create(){ aExp.cType = RSCEXP_NOTHING; } RscId() { Create(); } RscId( RscDefine * pEle ); - RscId( INT32 lNumber ) + RscId( sal_Int32 lNumber ) { aExp.SetLong( lNumber ); } RscId( const RscExpType & rExpType ) @@ -102,19 +102,19 @@ public: RscId& operator = ( const RscId& rRscId ); - static BOOL IsSetNames(); - static void SetNames( BOOL bSet = TRUE ); - operator INT32() const; // Gibt Nummer zurueck + static sal_Bool IsSetNames(); + static void SetNames( sal_Bool bSet = sal_True ); + operator sal_Int32() const; // Gibt Nummer zurueck ByteString GetName() const; // Gibt den Namen des Defines zurueck ByteString GetMacro() const; // Gibt das Macro zurueck - BOOL operator < ( const RscId& rRscId ) const; - BOOL operator > ( const RscId& rRscId ) const; - BOOL operator == ( const RscId& rRscId ) const; - BOOL operator <= ( const RscId& rRscId ) const + sal_Bool operator < ( const RscId& rRscId ) const; + sal_Bool operator > ( const RscId& rRscId ) const; + sal_Bool operator == ( const RscId& rRscId ) const; + sal_Bool operator <= ( const RscId& rRscId ) const { return !(operator > ( rRscId )); } - BOOL operator >= ( const RscId& rRscId ) const + sal_Bool operator >= ( const RscId& rRscId ) const { return !(operator < ( rRscId )); } - BOOL IsId() const { return !aExp.IsNothing(); } + sal_Bool IsId() const { return !aExp.IsNothing(); } }; /*********** R s c D e f i n e *******************************************/ @@ -125,15 +125,15 @@ friend class RscDefineList; friend class RscDefTree; friend class RscExpression; friend class RscId; - ULONG lFileKey; // zu welcher Datei gehoert das Define + sal_uLong lFileKey; // zu welcher Datei gehoert das Define sal_uInt32 nRefCount; // Wieviele Referenzen auf dieses Objekt - INT32 lId; // Identifier + sal_Int32 lId; // Identifier RscExpression * pExp; // Ausdruck protected: - RscDefine( ULONG lFileKey, const ByteString & rDefName, - INT32 lDefId ); - RscDefine( ULONG lFileKey, const ByteString & rDefName, + RscDefine( sal_uLong lFileKey, const ByteString & rDefName, + sal_Int32 lDefId ); + RscDefine( sal_uLong lFileKey, const ByteString & rDefName, RscExpression * pExpression ); ~RscDefine(); void IncRef(){ nRefCount++; } @@ -142,14 +142,14 @@ protected: void DefineToNumber(); void SetName( const ByteString & rNewName ){ aName = rNewName; } void ChangeMacro( RscExpression * pExpression ); - void ChangeMacro( INT32 lIdentifier ); + void ChangeMacro( sal_Int32 lIdentifier ); using StringNode::Search; public: RscDefine * Search( const char * ); - ULONG GetFileKey() const { return lFileKey; } - BOOL Evaluate(); - INT32 GetNumber() const { return lId; } + sal_uLong GetFileKey() const { return lFileKey; } + sal_Bool Evaluate(); + sal_Int32 GetNumber() const { return lId; } ByteString GetMacro(); }; @@ -160,14 +160,14 @@ friend class RscFile; friend class RscFileTab; private: // pExpression wird auf jedenfall Eigentum der Liste - RscDefine * New( ULONG lFileKey, const ByteString & rDefName, - INT32 lDefId, ULONG lPos ); - RscDefine * New( ULONG lFileKey, const ByteString & rDefName, - RscExpression * pExpression, ULONG lPos ); - BOOL Befor( const RscDefine * pFree, const RscDefine * pDepend ); - BOOL Remove( RscDefine * pDef ); - BOOL Remove( ULONG nIndex ); - BOOL Remove(); + RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName, + sal_Int32 lDefId, sal_uLong lPos ); + RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName, + RscExpression * pExpression, sal_uLong lPos ); + sal_Bool Befor( const RscDefine * pFree, const RscDefine * pDepend ); + sal_Bool Remove( RscDefine * pDef ); + sal_Bool Remove( sal_uLong nIndex ); + sal_Bool Remove(); public: void WriteAll( FILE * fOutput ); }; @@ -182,16 +182,16 @@ public: RscExpression( RscExpType aLE, char cOp, RscExpType aRE ); ~RscExpression(); - BOOL Evaluate( INT32 * pValue ); + sal_Bool Evaluate( sal_Int32 * pValue ); ByteString GetMacro(); }; /********************** R S C F I L E ************************************/ class RscDepend { - ULONG lKey; + sal_uLong lKey; public: - RscDepend( ULONG lIncKey ){ lKey = lIncKey; }; - ULONG GetFileKey(){ return lKey; } + RscDepend( sal_uLong lIncKey ){ lKey = lIncKey; }; + sal_uLong GetFileKey(){ return lKey; } }; DECLARE_LIST( RscDependList, RscDepend * ) @@ -199,22 +199,22 @@ DECLARE_LIST( RscDependList, RscDepend * ) class RscFile : public RscDependList { friend class RscFileTab; - BOOL bIncFile; // Ist es eine Include-Datei + sal_Bool bIncFile; // Ist es eine Include-Datei public: - BOOL bLoaded; // Ist die Datei geladen - BOOL bScanned; // Wurde Datei nach Inclide abgesucht - BOOL bDirty; // Dirty-Flag + sal_Bool bLoaded; // Ist die Datei geladen + sal_Bool bScanned; // Wurde Datei nach Inclide abgesucht + sal_Bool bDirty; // Dirty-Flag ByteString aFileName; // Name der Datei ByteString aPathName; // Pfad und Name der Datei RscDefineList aDefLst; // Liste der Defines RscFile(); ~RscFile(); - BOOL InsertDependFile( ULONG lDepFile, ULONG lPos ); - void RemoveDependFile( ULONG lDepFile ); - BOOL Depend( ULONG lDepend, ULONG lFree ); - void SetIncFlag(){ bIncFile = TRUE; }; - BOOL IsIncFile(){ return bIncFile; }; + sal_Bool InsertDependFile( sal_uLong lDepFile, sal_uLong lPos ); + void RemoveDependFile( sal_uLong lDepFile ); + sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree ); + void SetIncFlag(){ bIncFile = sal_True; }; + sal_Bool IsIncFile(){ return bIncFile; }; }; DECLARE_UNIQUEINDEX( RscSubFileTab, RscFile * ) @@ -223,11 +223,11 @@ DECLARE_UNIQUEINDEX( RscSubFileTab, RscFile * ) class RscDefTree { RscDefine * pDefRoot; public: - static BOOL Evaluate( RscDefine * pDef ); + static sal_Bool Evaluate( RscDefine * pDef ); RscDefTree(){ pDefRoot = NULL; } ~RscDefTree(); void Remove(); - BOOL Evaluate(); + sal_Bool Evaluate(); RscDefine * Search( const char * pName ); void Insert( RscDefine * pDef ); void Remove( RscDefine * pDef ); @@ -235,40 +235,40 @@ public: class RscFileTab : public RscSubFileTab { RscDefTree aDefTree; - ULONG Find( const ByteString & rName ); + sal_uLong Find( const ByteString & rName ); public: RscFileTab(); ~RscFileTab(); RscDefine * FindDef( const char * ); RscDefine * FindDef( const ByteString& rStr ) { return FindDef( rStr.GetBuffer() ); } - RscDefine * FindDef( ULONG lKey, const ByteString & ); + RscDefine * FindDef( sal_uLong lKey, const ByteString & ); - BOOL Depend( ULONG lDepend, ULONG lFree ); - BOOL TestDef( ULONG lFileKey, ULONG lPos, + sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree ); + sal_Bool TestDef( sal_uLong lFileKey, sal_uLong lPos, const RscDefine * pDefDec ); - BOOL TestDef( ULONG lFileKey, ULONG lPos, + sal_Bool TestDef( sal_uLong lFileKey, sal_uLong lPos, const RscExpression * pExpDec ); - RscDefine * NewDef( ULONG lKey, const ByteString & rDefName, - INT32 lId, ULONG lPos ); - RscDefine * NewDef( ULONG lKey, const ByteString & rDefName, - RscExpression *, ULONG lPos ); + RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName, + sal_Int32 lId, sal_uLong lPos ); + RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName, + RscExpression *, sal_uLong lPos ); - BOOL ChangeDef( const ByteString & rDefName, INT32 lId ); - BOOL ChangeDef( const ByteString & rDefName, RscExpression * ); + sal_Bool ChangeDef( const ByteString & rDefName, sal_Int32 lId ); + sal_Bool ChangeDef( const ByteString & rDefName, RscExpression * ); - BOOL IsDefUsed( const ByteString & ); + sal_Bool IsDefUsed( const ByteString & ); void DeleteDef( const ByteString & ); - BOOL ChangeDefName( const ByteString & rDefName, + sal_Bool ChangeDefName( const ByteString & rDefName, const ByteString & rNewName ); // Alle Defines die in dieser Datei Definiert sind loeschen - void DeleteFileContext( ULONG lKey ); - void DeleteFile( ULONG lKey ); - ULONG NewCodeFile( const ByteString & rName ); - ULONG NewIncFile( const ByteString & rName, const ByteString & rPath ); - RscFile * GetFile( ULONG lFileKey ){ return Get( lFileKey ); } + void DeleteFileContext( sal_uLong lKey ); + void DeleteFile( sal_uLong lKey ); + sal_uLong NewCodeFile( const ByteString & rName ); + sal_uLong NewIncFile( const ByteString & rName, const ByteString & rPath ); + RscFile * GetFile( sal_uLong lFileKey ){ return Get( lFileKey ); } }; #endif // _RSCDEF_HXX diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index f3a4428127f3..41f012040a0c 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -105,9 +105,9 @@ public: ERRTYPE( const ERRTYPE & rErr ) { nError = rErr.nError; }; ERRTYPE& operator = ( const ERRTYPE & rError ); operator sal_uInt32() const { return( nError ); } - BOOL IsError() const { return( nError <= ERR_ERROREND ); } - BOOL IsOk() const { return( !IsError() ); } - BOOL IsWarning() const { + sal_Bool IsError() const { return( nError <= ERR_ERROREND ); } + sal_Bool IsOk() const { return( !IsError() ); } + sal_Bool IsWarning() const { return( nError >= ERR_WARNINGSTART && nError <= ERR_WARNINGEND ); }; void Clear(){ nError = ERR_OK; } diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx index d517e0e0d2b3..2c36fdde6221 100644 --- a/rsc/inc/rscflag.hxx +++ b/rsc/inc/rscflag.hxx @@ -41,30 +41,30 @@ class RscFlag : public RscConst { RSCINST CreateBasic( RSCINST * pInst ); public: RscFlag( Atom nId, sal_uInt32 nTypId ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool ); RSCINST CreateClient( RSCINST * pInst, const RSCINST & rDflt, - BOOL bOwnClass, Atom nConsId ); + sal_Bool bOwnClass, Atom nConsId ); sal_uInt32 Size(); virtual void SetToDefault( const RSCINST & rInst ); - BOOL IsDefault( const RSCINST & rInst ); - BOOL IsDefault( const RSCINST & rInst, Atom nConstId ); + sal_Bool IsDefault( const RSCINST & rInst ); + sal_Bool IsDefault( const RSCINST & rInst, Atom nConstId ); // Ist das Flag gesetzt - BOOL IsSet( const RSCINST & rInst, Atom nConstId ); + sal_Bool IsSet( const RSCINST & rInst, Atom nConstId ); // Als Default setzen - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef, + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef, Atom nConstId ); ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - INT32 nValue ); + sal_Int32 nValue ); ERRTYPE SetNotConst( const RSCINST & rInst, Atom nConstId ); void WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); }; /******************* R s c C l i e n t ***********************************/ @@ -76,26 +76,26 @@ public: RscClient( Atom nId, sal_uInt32 nTypId, RscFlag * pClass, Atom nConstantId ); virtual RSCCLASS_TYPE GetClassType() const; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool ); sal_uInt32 Size(){ return( pRefClass->Size() ); }; // Eine Zuweisung an eine Variable - BOOL IsDefault( const RSCINST & rInst ){ + sal_Bool IsDefault( const RSCINST & rInst ){ return( pRefClass->IsDefault( rInst, nConstId ) ); }; // Als Default setzen - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ return pRefClass->IsValueDefault( rInst, pDef, nConstId ); } - ERRTYPE SetBool( const RSCINST & rInst, BOOL bValue ){ + ERRTYPE SetBool( const RSCINST & rInst, sal_Bool bValue ){ if( bValue ) return( pRefClass->SetConst( rInst, nConstId, bValue ) ); else return( pRefClass-> SetNotConst( rInst, nConstId ) ); }; - ERRTYPE GetBool( const RSCINST & rInst, BOOL * pB ){ + ERRTYPE GetBool( const RSCINST & rInst, sal_Bool * pB ){ *pB = pRefClass->IsSet( rInst, nConstId ); return( ERR_OK ); }; diff --git a/rsc/inc/rscinst.hxx b/rsc/inc/rscinst.hxx index 6cdfac1173e7..107060dd863c 100644 --- a/rsc/inc/rscinst.hxx +++ b/rsc/inc/rscinst.hxx @@ -59,7 +59,7 @@ public: RscInst& operator = ( const RscInst& rRscInst ); ~RscInst(); void OverWrite( RscInstCopy & rInst ); - BOOL IsInst() const { return( aInst.IsInst() ); } + sal_Bool IsInst() const { return( aInst.IsInst() ); } // Listen Methoden ERRTYPE SetElement( const RscId & rName, RscInstCopy & rInst ); @@ -75,17 +75,17 @@ public: ERRTYPE SetVar( Atom nVarName, RscInstCopy & rInst ); ERRTYPE SetConst( Atom nVarName, Atom nConstId ); - ERRTYPE SetBool( Atom nVarName, BOOL ); + ERRTYPE SetBool( Atom nVarName, sal_Bool ); // Hack fuer X, Y, Width, Height static ERRTYPE SetCorrectValues( RSCINST & rInst, RSCINST & rVarInst, - INT32 lValue, sal_uInt32 nTupelIdx ); - ERRTYPE SetNumber( Atom nVarName, INT32 ); + sal_Int32 lValue, sal_uInt32 nTupelIdx ); + ERRTYPE SetNumber( Atom nVarName, sal_Int32 ); ERRTYPE SetString( Atom nVarName, const char * ); ERRTYPE SetConst( Atom nConstId ); - ERRTYPE SetBool( BOOL ); - ERRTYPE SetNumber( INT32 ); + ERRTYPE SetBool( sal_Bool ); + ERRTYPE SetNumber( sal_Int32 ); ERRTYPE SetString( const char * ); ERRTYPE SetRef( const RscId & rRscId ); ERRTYPE SetDefault( Atom nVarName ); @@ -93,17 +93,17 @@ public: RscInst GetVar( Atom nVarName ); Atom GetConst( Atom nVarName = InvalidAtom ); sal_uInt32 GetConstPos( Atom nVarName = InvalidAtom ); - BOOL GetBool( Atom nVarName = InvalidAtom ); + sal_Bool GetBool( Atom nVarName = InvalidAtom ); // Hack fuer X, Y, Width, Height - static INT32 GetCorrectValues( RSCINST & rInst, RSCINST & rVarInst, + static sal_Int32 GetCorrectValues( RSCINST & rInst, RSCINST & rVarInst, sal_uInt32 nTupelIdx ); - INT32 GetNumber( Atom nVarName = InvalidAtom ); + sal_Int32 GetNumber( Atom nVarName = InvalidAtom ); const char *GetString( Atom nVarName = InvalidAtom ); RscId GetRef(); - BOOL IsDefault( Atom nVarName ); - BOOL IsConsistent( RscInconsList * pList ); + sal_Bool IsDefault( Atom nVarName ); + sal_Bool IsConsistent( RscInconsList * pList ); Atom GetClassEnum( Atom nVarName, sal_uInt32 nPos ); Atom GetClassEnum( sal_uInt32 nPos ); @@ -148,62 +148,62 @@ public: // Konvertiert einen Namen in einen Typ RscTop* GetClassType( Atom nClassName ); // Instanz einer Klasse erzeugen - BOOL MakeConsistent( RscInconsList * pList ); + sal_Bool MakeConsistent( RscInconsList * pList ); // Array mit Dateinamen RscFileTab* GetFileTab(); // Eine Dateinamen-Instanz holen - RscFile * GetFileStruct( ULONG lKey ); + RscFile * GetFileStruct( sal_uLong lKey ); - ULONG AddSrcFile( const ByteString & rFileName ); - ULONG AddHrcFile( const ByteString & rFileName ); + sal_uLong AddSrcFile( const ByteString & rFileName ); + sal_uLong AddHrcFile( const ByteString & rFileName ); // Traegt die Include-Dateien in die Abhaengigkeitsliste // von lFileKey ein - void ScanForIncFiles( ULONG lFileKey ); - void RemoveFile( ULONG lKey ); + void ScanForIncFiles( sal_uLong lFileKey ); + void RemoveFile( sal_uLong lKey ); // Suche ueber alle DEFINES RscDefine * FindDef( const ByteString & rName ); - ULONG GetFileKey( const ByteString & rFileName ); + sal_uLong GetFileKey( const ByteString & rFileName ); }; class RscHrc { protected: - ULONG lFileKey; // Index der Instanz + sal_uLong lFileKey; // Index der Instanz RscDataBase * pDataBase;// Datenbasis public: // Kompilerinstanz erzeugen - RscHrc( RscDataBase * pDBase, ULONG lKey ); + RscHrc( RscDataBase * pDBase, sal_uLong lKey ); ~RscHrc(); // Daten von Datei uebernehmen ERRTYPE ReadFile(); - ULONG GetFileKey() const { return lFileKey; } + sal_uLong GetFileKey() const { return lFileKey; } - void SetDirty( BOOL bSet ); - BOOL IsDirty(); + void SetDirty( sal_Bool bSet ); + sal_Bool IsDirty(); void SetPathName( const ByteString & ); ByteString GetPathName(); void SetFileName( const ByteString & ); ByteString GetFileName(); //Depend-Datei anhaengen - void InsertDepend( ULONG lKey, ULONG lPos ); + void InsertDepend( sal_uLong lKey, sal_uLong lPos ); // DefineList holen RscDefineList * GetDefineList(); // Suche ueber all DEFINES im Zugriff RscDefine * FindDef( const ByteString & rName ); - ERRTYPE NewDef( const ByteString & rMacroName, INT32 lValue, - ULONG lPos ); + ERRTYPE NewDef( const ByteString & rMacroName, sal_Int32 lValue, + sal_uLong lPos ); ERRTYPE NewDef( const ByteString & rMacroName, const ByteString & rMacro, - ULONG lPos ); - ERRTYPE ChangeDef( const ByteString & rMacroName, INT32 lValue ); + sal_uLong lPos ); + ERRTYPE ChangeDef( const ByteString & rMacroName, sal_Int32 lValue ); ERRTYPE ChangeDef( const ByteString & rMacroName, const ByteString & rMacro ); - BOOL IsDefUsed( const ByteString & ); + sal_Bool IsDefUsed( const ByteString & ); void DeleteDef( const ByteString & rMacroName ); ERRTYPE ChangeDefName( const ByteString & rMacroName, const ByteString & rNewName ); @@ -220,7 +220,7 @@ public: class RscSrc : public RscHrc { public: // Kompilerinstanz erzeugen - RscSrc( RscDataBase * pDBase, ULONG lKey ); + RscSrc( RscDataBase * pDBase, sal_uLong lKey ); ~RscSrc(); diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx index 717be1009154..221512e73eaf 100644 --- a/rsc/inc/rsckey.hxx +++ b/rsc/inc/rsckey.hxx @@ -39,13 +39,13 @@ typedef struct { } KEY_STRUCT; class RscNameTable { - BOOL bSort; //soll bei jedem einfuegen sortiert werden? + sal_Bool bSort; //soll bei jedem einfuegen sortiert werden? sal_uInt32 nEntries; //Anzahl der Eintr�ge KEY_STRUCT * pTable; public: RscNameTable(); ~RscNameTable(); - void SetSort( BOOL bSorted = TRUE ); + void SetSort( sal_Bool bSorted = sal_True ); Atom Put( Atom nName, sal_uInt32 nTyp, long nValue ); Atom Put( Atom nName, sal_uInt32 nTyp ); Atom Put( const char * pName, sal_uInt32 nTyp, long nValue ); @@ -53,8 +53,8 @@ public: Atom Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass ); Atom Put( const char * pName, sal_uInt32 nTyp, RscTop * pClass ); - // TRUE, wurde gefunden - BOOL Get( Atom nName, KEY_STRUCT * pEle ); + // sal_True, wurde gefunden + sal_Bool Get( Atom nName, KEY_STRUCT * pEle ); }; diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx index 89e4bfda2402..942205c5671e 100644 --- a/rsc/inc/rsclst.hxx +++ b/rsc/inc/rsclst.hxx @@ -43,14 +43,14 @@ protected: REResourceList* pParent; RscId aRscId; //Id und Name des Resourceobjektes ByteString aClassName; - BOOL bVisible; + sal_Bool bVisible; public: REResourceList(); REResourceList( REResourceList * pParentList, ByteString& rClassName, const RscId & rResourceID, - BOOL bVisible = FALSE ); + sal_Bool bVisible = sal_False ); ~REResourceList(); REResourceList* GetParent() { return pParent; } @@ -59,9 +59,9 @@ public: RscId GetRscId() { return aRscId; } void SetRscId( const RscId & rId ){ aRscId = rId; } - void SetVisible( BOOL bVis ) + void SetVisible( sal_Bool bVis ) { bVisible = bVis; } - BOOL IsVisible() { return bVisible; } + sal_Bool IsVisible() { return bVisible; } }; #endif // _RSCLST_HXX diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx index b8c0e43031ee..43c2b9720958 100644 --- a/rsc/inc/rscmgr.hxx +++ b/rsc/inc/rscmgr.hxx @@ -37,8 +37,8 @@ class RscMgr : public RscClass { struct RscMgrInst { RscId aRefId; // nRefId = Referenz Identifier - BOOL bDflt; // Ist Default - void Create(){ aRefId.Create(); bDflt = TRUE; } + sal_Bool bDflt; // Ist Default + void Create(){ aRefId.Create(); bDflt = sal_True; } void Destroy(){ aRefId.Destroy(); } }; ERRTYPE IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep = 0 ); @@ -46,10 +46,10 @@ public: RscMgr( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl ); void SetToDefault( const RSCINST & rInst ); - BOOL IsDefault( const RSCINST & rInst ); - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + sal_Bool IsDefault( const RSCINST & rInst ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool ); void Destroy( const RSCINST & rInst ); sal_uInt32 Size(); void WriteSrcHeader( const RSCINST & aInst, FILE * fOutput, @@ -60,9 +60,9 @@ public: RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, const RscId & rId, - sal_uInt32, BOOL bExtra ); + sal_uInt32, sal_Bool bExtra ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); ERRTYPE WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ); ERRTYPE WriteHxx( const RSCINST & rInst, FILE * fOutput, @@ -71,7 +71,7 @@ public: RscTypCont * pTC, const RscId & rId ); ERRTYPE WriteCxx( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ); - BOOL IsConsistent( const RSCINST & rInst, + sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList = NULL ); ERRTYPE GetRef( const RSCINST & rInst, RscId * ); ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ); diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx index 989ec924550c..952c4670616c 100644 --- a/rsc/inc/rscpar.hxx +++ b/rsc/inc/rscpar.hxx @@ -41,10 +41,10 @@ class RscFileInst ERRTYPE aFirstError;// Erster Fehler sal_uInt32 nErrorLine; // Zeile des ersten Fehlers sal_uInt32 nErrorPos; // Position des ersten Fehlers - BOOL bIncLine; // Muss Zeilennummer incrementiert werden + sal_Bool bIncLine; // Muss Zeilennummer incrementiert werden sal_uInt32 nLineNo; // Zeile in der Eingabedatei - ULONG lFileIndex; // Index auf Eingabedatei - ULONG lSrcIndex; // Index auf Basisdatei + sal_uLong lFileIndex; // Index auf Eingabedatei + sal_uLong lSrcIndex; // Index auf Basisdatei FILE * fInputFile; // Eingabedatei char * pInput; // Lesepuffer sal_uInt32 nInputBufLen; // Laenge des Lesepuffers @@ -54,20 +54,20 @@ class RscFileInst sal_uInt32 nLineBufLen;//Lange des Zeilenpuffres sal_uInt32 nScanPos; // Position in der Zeile int cLastChar; - BOOL bEof; + sal_Bool bEof; public: RscTypCont * pTypCont; void Init(); // ctor initialisieren - RscFileInst( RscTypCont * pTC, ULONG lIndexSrc, - ULONG lFileIndex, FILE * fFile ); - RscFileInst( RscTypCont * pTC, ULONG lIndexSrc, - ULONG lFileIndex, const ByteString & ); + RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, + sal_uLong lFileIndex, FILE * fFile ); + RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, + sal_uLong lFileIndex, const ByteString & ); ~RscFileInst(); - BOOL IsEof() const { return bEof; } - void SetFileIndex( ULONG lFIndex ) { lFileIndex = lFIndex; } - ULONG GetFileIndex() { return( lFileIndex ); } - ULONG GetSrcIndex() { return( lSrcIndex ); } + sal_Bool IsEof() const { return bEof; } + void SetFileIndex( sal_uLong lFIndex ) { lFileIndex = lFIndex; } + sal_uLong GetFileIndex() { return( lFileIndex ); } + sal_uLong GetSrcIndex() { return( lSrcIndex ); } void SetLineNo( sal_uInt32 nLine ) { nLineNo = nLine; } sal_uInt32 GetLineNo() { return( nLineNo ); } sal_uInt32 GetScanPos() { return( nScanPos ); } diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx index 96559037e51f..c23b2b97e715 100644 --- a/rsc/inc/rscrange.hxx +++ b/rsc/inc/rscrange.hxx @@ -38,36 +38,36 @@ class RscRange : public RscTop protected: struct RscRangeInst { sal_uInt16 nValue; // nValue = Ausgangswert - nMin - BOOL bDflt; // Ist Default + sal_Bool bDflt; // Ist Default }; - INT32 nMin; // Minimum des Bereiches - INT32 nMax; // Maximum des Bereiches + sal_Int32 nMin; // Minimum des Bereiches + sal_Int32 nMax; // Maximum des Bereiches sal_uInt32 nSize; public: RscRange( Atom nId, sal_uInt32 nTypId ); virtual RSCCLASS_TYPE GetClassType() const; - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool ); // Der zulaessige Bereich wird gesetzt - ERRTYPE SetRange( INT32 nMinimum, INT32 nMaximum ); + ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ); // Gibt die Groesse der Klasse in Bytes sal_uInt32 Size(){ return nSize; } // Eine Zuweisung an eine Variable virtual void SetToDefault( const RSCINST & rInst ) { - ((RscRangeInst*)rInst.pData)->bDflt = TRUE; + ((RscRangeInst*)rInst.pData)->bDflt = sal_True; } - BOOL IsDefault( const RSCINST & rInst) + sal_Bool IsDefault( const RSCINST & rInst) { return( ((RscRangeInst*)rInst.pData)->bDflt ); }; // Als Default setzen - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - ERRTYPE SetNumber( const RSCINST &, INT32 ); - ERRTYPE GetNumber( const RSCINST &, INT32 * ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + ERRTYPE SetNumber( const RSCINST &, sal_Int32 ); + ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ); void WriteSrc( const RSCINST &, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, const char * ); }; @@ -78,37 +78,37 @@ class RscLongRange : public RscTop protected: struct RscLongRangeInst { - INT32 nValue; // nValue = Ausgangswert - nMin - BOOL bDflt; // Ist Default + sal_Int32 nValue; // nValue = Ausgangswert - nMin + sal_Bool bDflt; // Ist Default }; - INT32 nMin; // Minimum des Bereiches - INT32 nMax; // Maximum des Bereiches + sal_Int32 nMin; // Minimum des Bereiches + sal_Int32 nMax; // Maximum des Bereiches sal_uInt32 nSize; public: RscLongRange( Atom nId, sal_uInt32 nTypId ); virtual RSCCLASS_TYPE GetClassType() const; - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool ); // Der zulaessige Bereich wird gesetzt - ERRTYPE SetRange( INT32 nMinimum, INT32 nMaximum ); + ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ); // Gibt die Groesse der Klasse in Bytes sal_uInt32 Size(){ return nSize; } // Eine Zuweisung an eine Variable virtual void SetToDefault( const RSCINST & rInst ) { - ((RscLongRangeInst*)rInst.pData)->bDflt = TRUE; + ((RscLongRangeInst*)rInst.pData)->bDflt = sal_True; } - BOOL IsDefault( const RSCINST & rInst) + sal_Bool IsDefault( const RSCINST & rInst) { return( ((RscLongRangeInst*)rInst.pData)->bDflt ); }; // Als Default setzen - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - ERRTYPE SetNumber( const RSCINST &, INT32 ); - ERRTYPE GetNumber( const RSCINST &, INT32 * ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + ERRTYPE SetNumber( const RSCINST &, sal_Int32 ); + ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ); void WriteSrc( const RSCINST &, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, const char * ); @@ -121,7 +121,7 @@ public: RscLongEnumRange( Atom nId, sal_uInt32 nTypId ); ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - INT32 nValue ); + sal_Int32 nValue ); }; /******************* R s c I d R a n g e ***********************************/ @@ -129,41 +129,41 @@ class RscIdRange : public RscTop { sal_uInt32 nSize; protected: - INT32 nMin; // Minimum des Bereiches - INT32 nMax; // Maximum des Bereiches + sal_Int32 nMin; // Minimum des Bereiches + sal_Int32 nMax; // Maximum des Bereiches public: RscIdRange( Atom nId, sal_uInt32 nTypId ); virtual RSCCLASS_TYPE GetClassType() const; // Der zulaessige Bereich wird gesetzt - ERRTYPE SetRange( INT32 nMinimum, INT32 nMaximum ){ + ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ){ nMin = nMinimum; nMax = nMaximum; return ERR_OK; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool ); void Destroy( const RSCINST & rInst ); sal_uInt32 Size(){ return nSize; } virtual void SetToDefault( const RSCINST & rInst ) { - ((RscId*)rInst.pData)->aExp.cUnused = TRUE; + ((RscId*)rInst.pData)->aExp.cUnused = sal_True; } - BOOL IsDefault( const RSCINST & rInst) + sal_Bool IsDefault( const RSCINST & rInst) { //cUnused wird fuer Defaultkennung verwendet return ((RscId*)rInst.pData)->aExp.cUnused - ? TRUE : FALSE; + ? sal_True : sal_False; } // Als Default setzen - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - ERRTYPE SetNumber( const RSCINST &, INT32 ); - ERRTYPE GetNumber( const RSCINST &, INT32 * ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + ERRTYPE SetNumber( const RSCINST &, sal_Int32 ); + ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ); ERRTYPE SetRef( const RSCINST &, const RscId & rRscId ); ERRTYPE GetRef( const RSCINST & rInst, RscId * ); void WriteSrc( const RSCINST &, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); - BOOL IsConsistent( const RSCINST & rInst, RscInconsList * pList ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); + sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList ); void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, const char * ); @@ -176,14 +176,14 @@ public: RscBool( Atom nId, sal_uInt32 nTypId ); virtual RSCCLASS_TYPE GetClassType() const; // Der zulaessige Bereich wird gesetzt - ERRTYPE SetRange( INT32, INT32 ){ + ERRTYPE SetRange( sal_Int32, sal_Int32 ){ return( ERR_UNKNOWN_METHOD ); }; - ERRTYPE SetBool( const RSCINST & rInst, BOOL b ){ - return( SetNumber( rInst, (INT32)b ) ); + ERRTYPE SetBool( const RSCINST & rInst, sal_Bool b ){ + return( SetNumber( rInst, (sal_Int32)b ) ); }; - ERRTYPE GetBool( const RSCINST & rInst, BOOL * pB){ - INT32 l; + ERRTYPE GetBool( const RSCINST & rInst, sal_Bool * pB){ + sal_Int32 l; GetNumber( rInst, &l ); *pB = (0 != l); return( ERR_OK ); @@ -196,14 +196,14 @@ public: }; class RscBreakRange : public RscRange { - INT32 nOutRange; + sal_Int32 nOutRange; public: RscBreakRange( Atom nId, sal_uInt32 nTypId ); - void SetOutRange( INT32 nNumber ){ + void SetOutRange( sal_Int32 nNumber ){ nOutRange = nNumber; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL ); - ERRTYPE SetNumber( const RSCINST &, INT32 ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool ); + ERRTYPE SetNumber( const RSCINST &, sal_Int32 ); }; #endif // _RSCRANGE_HXX diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx index c2b0a70a1b66..711b686f8a27 100644 --- a/rsc/inc/rscrsc.hxx +++ b/rsc/inc/rscrsc.hxx @@ -129,8 +129,8 @@ public: ByteString GetTmpFileName(); // Die Dateien werden geloescht // Include Statements lesen - ERRTYPE IncludeParser( ULONG lFileKey ); - ERRTYPE ParseOneFile( ULONG lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext ); + ERRTYPE IncludeParser( sal_uLong lFileKey ); + ERRTYPE ParseOneFile( sal_uLong lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext ); ERRTYPE Link(); void EndCompile(); }; diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx index 6d32a437b09e..e485a023d933 100644 --- a/rsc/inc/rscstr.hxx +++ b/rsc/inc/rscstr.hxx @@ -38,7 +38,7 @@ class RscString : public RscTop RscTop * pRefClass; struct RscStringInst { char * pStr; // Zeiger auf String - BOOL bDflt; // Ist Default + sal_Bool bDflt; // Ist Default RscId aRefId; // ReferenzName }; sal_uInt32 nSize; @@ -50,20 +50,20 @@ public: { pRefClass = pClass; }; - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool ); // Der zulaessige Bereich wird gesetzt void Destroy( const RSCINST & rInst ); sal_uInt32 Size(){ return nSize; } void SetToDefault( const RSCINST & rInst ) { - ((RscStringInst*)rInst.pData)->bDflt = TRUE; + ((RscStringInst*)rInst.pData)->bDflt = sal_True; } - BOOL IsDefault( const RSCINST & rInst) + sal_Bool IsDefault( const RSCINST & rInst) { return( ((RscStringInst*)rInst.pData)->bDflt ); }; // Als Default setzen - BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); ERRTYPE SetString( const RSCINST &, const char * pStr ); ERRTYPE GetString( const RSCINST &, char ** ppStr ); ERRTYPE GetRef( const RSCINST & rInst, RscId * ); @@ -71,7 +71,7 @@ public: void WriteSrc( const RSCINST &, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, const char * ); }; diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index 3a3eff653cd7..a119ab7f1431 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -48,8 +48,8 @@ enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN }; (nSize + sizeof( void * ) -1) / sizeof( void * ) * sizeof( void * ) /******************* F u n c t i o n F o r w a r d s *******************/ ByteString GetTmpFileName(); -BOOL Append( ByteString aDestFile, ByteString aSourceFile ); -BOOL Append( FILE * fDest, ByteString aSourceFile ); +sal_Bool Append( ByteString aDestFile, ByteString aSourceFile ); +sal_Bool Append( FILE * fDest, ByteString aSourceFile ); ByteString InputFile ( const char * pInput, const char * pExt ); ByteString OutputFile( ByteString aInput, const char * ext ); char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, @@ -67,7 +67,7 @@ DECLARE_LIST( RscStrList, ByteString * ) class RscChar { public: - static char * MakeUTF8( char * pStr, UINT16 nTextEncoding ); + static char * MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ); }; /****************** R s c P t r P t r ************************************/ @@ -92,7 +92,7 @@ public: class RscWriteRc { sal_uInt32 nLen; - BOOL bSwap; + sal_Bool bSwap; RSCBYTEORDER_TYPE nByteOrder; char * pMem; char * GetPointer( sal_uInt32 nSize ); @@ -178,7 +178,7 @@ public: { Put( (sal_uInt16)nValue ); } void PutUTF8( char * pData ); - void PutAt( sal_uInt32 nPos, INT32 lVal ) + void PutAt( sal_uInt32 nPos, sal_Int32 lVal ) { union { @@ -200,7 +200,7 @@ public: } void PutAt( sal_uInt32 nPos, sal_uInt32 lVal ) { - PutAt( nPos, (INT32)lVal); + PutAt( nPos, (sal_Int32)lVal); } void PutAt( sal_uInt32 nPos, short nVal ) { diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index 85aa06614574..2e23d5ef410a 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -70,8 +70,8 @@ public: sal_uInt32 GetTypId() const { return nTypId; }; // Gibt die Oberklasse zurueck - BOOL InHierarchy( RscTop * pClass ); - BOOL IsCodeWriteable() const + sal_Bool InHierarchy( RscTop * pClass ); + sal_Bool IsCodeWriteable() const { return( 0 != aCallParType.Len() ); } @@ -114,7 +114,7 @@ public: // pData, pClass im return koennen NULL sein virtual RSCINST GetVariable( const RSCINST & rInst, Atom nVarName, const RSCINST & rInitInst, - BOOL nInitDflt = FALSE, + sal_Bool nInitDflt = sal_False, RscTop * pCreateClass = NULL ); virtual RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName ); @@ -129,7 +129,7 @@ public: // Liefert Instanz aus einem Feld zurueck // pGetInst im return kann NULL sein - virtual ERRTYPE GetValueEle( const RSCINST & rInst, INT32 lValue, + virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue, RscTop * pCreateClass, RSCINST * pGetInst ); @@ -161,46 +161,46 @@ public: virtual sal_uInt32 GetCount( const RSCINST & rInst ); // Eine Zuweisung an eine Variable - virtual ERRTYPE SetNumber( const RSCINST & rInst, INT32 lValue ); + virtual ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 lValue ); // Eine Zuweisung an eine Variable - virtual ERRTYPE SetBool( const RSCINST & rInst, BOOL bValue ); + virtual ERRTYPE SetBool( const RSCINST & rInst, sal_Bool bValue ); // Eine Zuweisung an eine Variable virtual ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - INT32 nValue ); + sal_Int32 nValue ); // Eine Zuweisung an eine Variable virtual ERRTYPE SetNotConst( const RSCINST & rInst, Atom nId ); virtual ERRTYPE SetString( const RSCINST & rInst, const char * pStr ); - virtual ERRTYPE GetNumber( const RSCINST & rInst, INT32 * pN ); + virtual ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * pN ); - virtual ERRTYPE GetBool( const RSCINST & rInst, BOOL * pB ); + virtual ERRTYPE GetBool( const RSCINST & rInst, sal_Bool * pB ); virtual ERRTYPE GetConst( const RSCINST & rInst, Atom * pH ); virtual ERRTYPE GetString( const RSCINST & rInst, char ** ppStr ); virtual RSCINST Create( RSCINST * pInst, - const RSCINST & rDefInst, BOOL bOwnClass = FALSE ); + const RSCINST & rDefInst, sal_Bool bOwnClass = sal_False ); // Instanz zerstoeren virtual void Destroy( const RSCINST & rInst ); // prueft auf konsistenz - virtual BOOL IsConsistent( const RSCINST & rInst, + virtual sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList = NULL ); // Alles auf Default setzen virtual void SetToDefault( const RSCINST & rInst ); // Ist Eingabe = Default - virtual BOOL IsDefault( const RSCINST & rInst ); + virtual sal_Bool IsDefault( const RSCINST & rInst ); // Gleiche Werte auf Default setzen - virtual BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + virtual sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); // Instanz auf Default setzen virtual void SetDefault( const RSCINST & rInst, Atom nVarId ); @@ -222,9 +222,9 @@ public: RscTypCont * pTC, sal_uInt32 nTab,const char * ); virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, const RscId & aId, - sal_uInt32 nDeep, BOOL bExtra ); + sal_uInt32 nDeep, sal_Bool bExtra ); virtual ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ); + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ); // Weiterleitung an Superklassen wird unterbunden virtual ERRTYPE WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx index 0ee0f3b5056f..30f56da2cdd7 100644 --- a/rsc/inc/rsctree.hxx +++ b/rsc/inc/rsctree.hxx @@ -70,15 +70,15 @@ public: NameNode* Right() const{ return (NameNode *)pRight ; }; NameNode* Search( const NameNode * pName ) const; // insert a new node in the b-tree - BOOL Insert( NameNode * pTN, sal_uInt32 * nDepth ); - BOOL Insert( NameNode* pTN ); + sal_Bool Insert( NameNode * pTN, sal_uInt32 * nDepth ); + sal_Bool Insert( NameNode* pTN ); virtual COMPARE Compare( const NameNode * ) const; virtual COMPARE Compare( const void * ) const; NameNode* SearchParent( const NameNode * ) const; // return ist neue Root NameNode* Remove( NameNode * ); void OrderTree(); - BOOL IsOrderTree() const; + sal_Bool IsOrderTree() const; }; diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx index 591f6b3fd4f6..7afde9e7c65b 100644 --- a/rsc/source/misc/rscdbl.cxx +++ b/rsc/source/misc/rscdbl.cxx @@ -81,7 +81,7 @@ void FillSubList( RSCINST & rInst, REResourceList * pList ) } void FillListObj( ObjNode * pObjNode, RscTop * pRscTop, - REResourceList * pList, ULONG lFileKey ) + REResourceList * pList, sal_uLong lFileKey ) { if( pObjNode ){ if( pObjNode->GetFileKey() == lFileKey ){ @@ -104,7 +104,7 @@ void FillListObj( ObjNode * pObjNode, RscTop * pRscTop, }; } -void FillList( RscTop * pRscTop, REResourceList * pList, ULONG lFileKey ){ +void FillList( RscTop * pRscTop, REResourceList * pList, sal_uLong lFileKey ){ if( pRscTop ){ FillList( (RscTop*)pRscTop->Left(), pList, lFileKey ); @@ -114,6 +114,6 @@ void FillList( RscTop * pRscTop, REResourceList * pList, ULONG lFileKey ){ }; } -void RscTypCont::FillNameIdList( REResourceList * pList, ULONG lFileKey ){ +void RscTypCont::FillNameIdList( REResourceList * pList, sal_uLong lFileKey ){ FillList( pRoot, pList, lFileKey ); } diff --git a/rsc/source/misc/rsclst.cxx b/rsc/source/misc/rsclst.cxx index ee2d4a14f328..ec70635efc44 100644 --- a/rsc/source/misc/rsclst.cxx +++ b/rsc/source/misc/rsclst.cxx @@ -32,13 +32,13 @@ REResourceList :: REResourceList() { - bVisible = FALSE; + bVisible = sal_False; pParent = NULL; } REResourceList :: REResourceList( REResourceList* pParentList, ByteString& rClassName, - const RscId & rResourceID, BOOL bVis ) + const RscId & rResourceID, sal_Bool bVis ) { pParent = pParentList; aClassName = rClassName; 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 ) ); } diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index a60db4f54d2f..75239f82e55b 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -52,7 +52,7 @@ #include <hash_map> /****************** M A C R O S ******************************************/ -void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal ) +void RscTypCont::SETCONST( RscConst * pClass, const char * szString, sal_uInt32 nVal ) { #if OSL_DEBUG_LEVEL > 2 fprintf( stderr, "setconst : %s\n", szString ); @@ -61,7 +61,7 @@ void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal CONSTNAME, nVal ), nVal ); } -void RscTypCont::SETCONST( RscConst * pClass, Atom nName, UINT32 nVal ) +void RscTypCont::SETCONST( RscConst * pClass, Atom nName, sal_uInt32 nVal ) { #if OSL_DEBUG_LEVEL > 2 fprintf( stderr, "setconst hash: %u\n", (unsigned int)nName ); @@ -484,12 +484,12 @@ RscEnum * RscTypCont::InitMessButtons() { RscEnum * pMessButtons; pMessButtons = new RscEnum( pHS->getID( "EnumMessButtons" ), RSC_NOTYPE ); - SETCONST( pMessButtons, "WB_OK", sal::static_int_cast<UINT32>(WB_OK) ); - SETCONST( pMessButtons, "WB_OK_CANCEL", sal::static_int_cast<UINT32>(WB_OK_CANCEL) ); - SETCONST( pMessButtons, "WB_YES_NO", sal::static_int_cast<UINT32>(WB_YES_NO) ); - SETCONST( pMessButtons, "WB_YES_NO_CANCEL", sal::static_int_cast<UINT32>(WB_YES_NO_CANCEL) ); - SETCONST( pMessButtons, "WB_RETRY_CANCEL", sal::static_int_cast<UINT32>(WB_RETRY_CANCEL) ); - SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE", sal::static_int_cast<UINT32>(WB_ABORT_RETRY_IGNORE) ); + SETCONST( pMessButtons, "WB_OK", sal::static_int_cast<sal_uInt32>(WB_OK) ); + SETCONST( pMessButtons, "WB_OK_CANCEL", sal::static_int_cast<sal_uInt32>(WB_OK_CANCEL) ); + SETCONST( pMessButtons, "WB_YES_NO", sal::static_int_cast<sal_uInt32>(WB_YES_NO) ); + SETCONST( pMessButtons, "WB_YES_NO_CANCEL", sal::static_int_cast<sal_uInt32>(WB_YES_NO_CANCEL) ); + SETCONST( pMessButtons, "WB_RETRY_CANCEL", sal::static_int_cast<sal_uInt32>(WB_RETRY_CANCEL) ); + SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE", sal::static_int_cast<sal_uInt32>(WB_ABORT_RETRY_IGNORE) ); return( pMessButtons ); } @@ -507,12 +507,12 @@ RscEnum * RscTypCont::InitMessDefButton(){ pMessDefButton = new RscEnum( pHS->getID( "EnumMessDefButton" ), RSC_NOTYPE ); - SETCONST( pMessDefButton, "WB_DEF_OK", sal::static_int_cast<UINT32>(WB_DEF_OK) ); - SETCONST( pMessDefButton, "WB_DEF_CANCEL", sal::static_int_cast<UINT32>(WB_DEF_CANCEL) ); - SETCONST( pMessDefButton, "WB_DEF_RETRY", sal::static_int_cast<UINT32>(WB_DEF_RETRY) ); - SETCONST( pMessDefButton, "WB_DEF_YES", sal::static_int_cast<UINT32>(WB_DEF_YES) ); - SETCONST( pMessDefButton, "WB_DEF_NO", sal::static_int_cast<UINT32>(WB_DEF_NO) ); - SETCONST( pMessDefButton, "WB_DEF_IGNORE", sal::static_int_cast<UINT32>(WB_DEF_IGNORE) ); + SETCONST( pMessDefButton, "WB_DEF_OK", sal::static_int_cast<sal_uInt32>(WB_DEF_OK) ); + SETCONST( pMessDefButton, "WB_DEF_CANCEL", sal::static_int_cast<sal_uInt32>(WB_DEF_CANCEL) ); + SETCONST( pMessDefButton, "WB_DEF_RETRY", sal::static_int_cast<sal_uInt32>(WB_DEF_RETRY) ); + SETCONST( pMessDefButton, "WB_DEF_YES", sal::static_int_cast<sal_uInt32>(WB_DEF_YES) ); + SETCONST( pMessDefButton, "WB_DEF_NO", sal::static_int_cast<sal_uInt32>(WB_DEF_NO) ); + SETCONST( pMessDefButton, "WB_DEF_IGNORE", sal::static_int_cast<sal_uInt32>(WB_DEF_IGNORE) ); return( pMessDefButton ); } diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 8b9a088c76cc..45e8d5aac301 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -55,7 +55,7 @@ void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName, // Clientvariablen einfuegen aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nVal ), LIST_APPEND ); Atom nId = aNmTb.Put( rName.GetBuffer(), VARNAME ); @@ -76,7 +76,7 @@ RscTop * RscTypCont::InitClassMgr() Atom nId; aBaseLst.Insert( pClass = - new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, FALSE ), + new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, sal_False ), LIST_APPEND ); nId = pHS->getID( "Resource" ); @@ -218,7 +218,7 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitma pClassImageList->SetVariable( nId, pClassColor, NULL, VAR_SVDYNAMIC, RSC_IMAGELIST_MASKCOLOR ); - RscCont * pCont = new RscCont( pHS->getID( "USHORT *" ), RSC_NOTYPE ); + RscCont * pCont = new RscCont( pHS->getID( "sal_uInt16 *" ), RSC_NOTYPE ); pCont->SetTypeClass( &aIdUShort ); aBaseLst.Insert( pCont, LIST_APPEND ); nId = aNmTb.Put( "IdList", VARNAME ); @@ -271,7 +271,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, VAR_HIDDEN | VAR_NOENUM ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nDisableId ), LIST_APPEND ); nId = aNmTb.Put( "Disable", VARNAME ); @@ -279,7 +279,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, VAR_NODATAINST, 0, nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nOutputSizeId ), LIST_APPEND ); nId = aNmTb.Put( "OutputSize", VARNAME ); @@ -700,7 +700,7 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) { RSCINST aDfltI; - aDfltI = aShort.Create( NULL, RSCINST(), FALSE ); + aDfltI = aShort.Create( NULL, RSCINST(), sal_False ); aDfltI.pClass->SetNumber( aDfltI, 100 ); // aDfltI.pClass->MakeDefault( aDfltI ); @@ -712,7 +712,7 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) { RSCINST aDfltI; - aDfltI = aShort.Create( NULL, RSCINST(), FALSE ); + aDfltI = aShort.Create( NULL, RSCINST(), sal_False ); aDfltI.pClass->SetNumber( aDfltI, 1 ); // aDfltI.pClass->MakeDefault( aDfltI ); @@ -722,7 +722,7 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) { RSCINST aDfltI; - aDfltI = aShort.Create( NULL, RSCINST(), FALSE ); + aDfltI = aShort.Create( NULL, RSCINST(), sal_False ); aDfltI.pClass->SetNumber( aDfltI, 1 ); // aDfltI.pClass->MakeDefault( aDfltI ); nId = aNmTb.Put( "LineSize", VARNAME ); @@ -762,8 +762,8 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) INS_WINBIT(pClassListBox,DDExtraWidth) { - RSCINST aDflt = aUShort.Create( NULL, RSCINST(), FALSE ); - aDflt.pClass->SetNumber( aDflt, (USHORT)0xFFFF ); + RSCINST aDflt = aUShort.Create( NULL, RSCINST(), sal_False ); + aDflt.pClass->SetNumber( aDflt, (sal_uInt16)0xFFFF ); nId = aNmTb.Put( "CurPos", VARNAME ); pClassListBox->SetVariable( nId, &aUShort, &aDflt ); } @@ -982,7 +982,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) // Clientvariablen einfuegen aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nShiftId ), LIST_APPEND ); nId = aNmTb.Put( "Shift", VARNAME ); @@ -990,7 +990,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) VAR_NODATAINST, 0, nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nMod1Id ), LIST_APPEND ); nId = aNmTb.Put( "Modifier1", VARNAME ); @@ -999,7 +999,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nMod2Id ), LIST_APPEND ); nId = aNmTb.Put( "Modifier2", VARNAME ); @@ -1151,7 +1151,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, // Clientvariablen einfuegen aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nCheckableId ), LIST_APPEND ); nId = aNmTb.Put( "Checkable", VARNAME ); @@ -1159,7 +1159,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, VAR_NODATAINST, 0, nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nAutoCheckId ), LIST_APPEND ); nId = aNmTb.Put( "AutoCheck", VARNAME ); @@ -1167,7 +1167,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, VAR_NODATAINST, 0, nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nRadioCheckId ), LIST_APPEND ); nId = aNmTb.Put( "RadioCheck", VARNAME ); @@ -1175,7 +1175,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, VAR_NODATAINST, 0, nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nAboutId ), LIST_APPEND ); nId = aNmTb.Put( "About", VARNAME ); @@ -1183,7 +1183,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, VAR_NODATAINST, 0, nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nHelpId ), LIST_APPEND ); nId = aNmTb.Put( "Help", VARNAME ); @@ -1979,37 +1979,37 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, // Clientvariablen einfuegen aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nCheckableId ), LIST_APPEND ); nId = aNmTb.Put( "Checkable", VARNAME ); pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nAutoCheckId ), LIST_APPEND ); nId = aNmTb.Put( "AutoCheck", VARNAME ); pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nRadioCheckId ), LIST_APPEND ); nId = aNmTb.Put( "RadioCheck", VARNAME ); pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nLeftId ), LIST_APPEND ); nId = aNmTb.Put( "Left", VARNAME ); pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nAutoSizeId ), LIST_APPEND ); nId = aNmTb.Put( "AutoSize", VARNAME ); pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nDropDownId ), LIST_APPEND ); nId = aNmTb.Put( "DropDown", VARNAME ); pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index aded8db5f865..a686fbb5a101 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -194,7 +194,7 @@ void RscTypCont::Init() Atom nId; - aNmTb.SetSort( FALSE ); + aNmTb.SetSort( sal_False ); { /********** C O M P I L E R T Y P E N ******************************/ aNmTb.Put( "LINE", LINE, (long)0 ); @@ -207,8 +207,8 @@ void RscTypCont::Init() aNmTb.Put( "writeifset", WRITEIFSET, (long)0 ); /* Werte fuer Aufzaehlungstypen */ - aNmTb.Put( "TRUE", BOOLEAN, (long)TRUE ); - aNmTb.Put( "FALSE", BOOLEAN, (long)FALSE ); + aNmTb.Put( "TRUE", BOOLEAN, (long)sal_True ); + aNmTb.Put( "FALSE", BOOLEAN, (long)sal_False ); #if 0 /* Vordefinierte HilfeId's */ @@ -265,115 +265,115 @@ void RscTypCont::Init() // Windows nBorderId = pHS->getID( "WB_BORDER" ); - aWinBits.SetConstant( nBorderId, sal::static_int_cast<INT32>(WB_BORDER) ); + aWinBits.SetConstant( nBorderId, sal::static_int_cast<sal_Int32>(WB_BORDER) ); nHideId = pHS->getID( "WB_HIDE" ); - aWinBits.SetConstant( nHideId, sal::static_int_cast<INT32>(WB_HIDE) ); + aWinBits.SetConstant( nHideId, sal::static_int_cast<sal_Int32>(WB_HIDE) ); nClipChildrenId = pHS->getID( "WB_CLIPCHILDREN" ); - aWinBits.SetConstant( nClipChildrenId, sal::static_int_cast<INT32>(WB_CLIPCHILDREN) ); + aWinBits.SetConstant( nClipChildrenId, sal::static_int_cast<sal_Int32>(WB_CLIPCHILDREN) ); nSizeableId = pHS->getID( "WB_SIZEABLE" ); - aWinBits.SetConstant( nSizeableId, sal::static_int_cast<INT32>(WB_SIZEABLE) ); + aWinBits.SetConstant( nSizeableId, sal::static_int_cast<sal_Int32>(WB_SIZEABLE) ); nMoveableId = pHS->getID( "WB_MOVEABLE" ); - aWinBits.SetConstant( nMoveableId, sal::static_int_cast<INT32>(WB_MOVEABLE) ); + aWinBits.SetConstant( nMoveableId, sal::static_int_cast<sal_Int32>(WB_MOVEABLE) ); nMinimizeId = pHS->getID( "WB_MINABLE" ); aWinBits.SetConstant( nMinimizeId, 0 /*WB_MINABLE*/ ); nMaximizeId = pHS->getID( "WB_MAXABLE" ); aWinBits.SetConstant( nMaximizeId, 0 /*WB_MAXABLE*/ ); nCloseableId = pHS->getID( "WB_CLOSEABLE" ); - aWinBits.SetConstant( nCloseableId, sal::static_int_cast<INT32>(WB_CLOSEABLE) ); + aWinBits.SetConstant( nCloseableId, sal::static_int_cast<sal_Int32>(WB_CLOSEABLE) ); nAppId = pHS->getID( "WB_APP" ); - aWinBits.SetConstant( nAppId, sal::static_int_cast<INT32>(WB_APP) ); + aWinBits.SetConstant( nAppId, sal::static_int_cast<sal_Int32>(WB_APP) ); nTabstopId = pHS->getID( "WB_TABSTOP" ); - aWinBits.SetConstant( nTabstopId, sal::static_int_cast<INT32>(WB_TABSTOP) ); + aWinBits.SetConstant( nTabstopId, sal::static_int_cast<sal_Int32>(WB_TABSTOP) ); nGroupId = pHS->getID( "WB_GROUP" ); - aWinBits.SetConstant( nGroupId, sal::static_int_cast<INT32>(WB_GROUP) ); + aWinBits.SetConstant( nGroupId, sal::static_int_cast<sal_Int32>(WB_GROUP) ); nSysmodalId = pHS->getID( "WB_SYSMODAL" ); aWinBits.SetConstant( nSysmodalId, 0 /*WB_SYSMODAL*/ ); } { nLeftId = pHS->getID( "WB_LEFT" ); - aWinBits.SetConstant( nLeftId, sal::static_int_cast<INT32>(WB_LEFT) ); + aWinBits.SetConstant( nLeftId, sal::static_int_cast<sal_Int32>(WB_LEFT) ); nCenterId = pHS->getID( "WB_CENTER" ); - aWinBits.SetConstant( nCenterId, sal::static_int_cast<INT32>(WB_CENTER) ); + aWinBits.SetConstant( nCenterId, sal::static_int_cast<sal_Int32>(WB_CENTER) ); nRightId = pHS->getID( "WB_RIGHT" ); - aWinBits.SetConstant( nRightId, sal::static_int_cast<INT32>(WB_RIGHT) ); + aWinBits.SetConstant( nRightId, sal::static_int_cast<sal_Int32>(WB_RIGHT) ); nTopId = pHS->getID( "WB_TOP" ); - aWinBits.SetConstant( nTopId, sal::static_int_cast<INT32>(WB_TOP) ); + aWinBits.SetConstant( nTopId, sal::static_int_cast<sal_Int32>(WB_TOP) ); nVCenterId = pHS->getID( "WB_VCENTER" ); - aWinBits.SetConstant( nVCenterId, sal::static_int_cast<INT32>(WB_VCENTER) ); + aWinBits.SetConstant( nVCenterId, sal::static_int_cast<sal_Int32>(WB_VCENTER) ); nBottomId = pHS->getID( "WB_BOTTOM" ); - aWinBits.SetConstant( nBottomId, sal::static_int_cast<INT32>(WB_BOTTOM) ); + aWinBits.SetConstant( nBottomId, sal::static_int_cast<sal_Int32>(WB_BOTTOM) ); nHScrollId = pHS->getID( "WB_HSCROLL" ); - aWinBits.SetConstant( nHScrollId, sal::static_int_cast<INT32>(WB_HSCROLL) ); + aWinBits.SetConstant( nHScrollId, sal::static_int_cast<sal_Int32>(WB_HSCROLL) ); nVScrollId = pHS->getID( "WB_VSCROLL" ); - aWinBits.SetConstant( nVScrollId, sal::static_int_cast<INT32>(WB_VSCROLL) ); + aWinBits.SetConstant( nVScrollId, sal::static_int_cast<sal_Int32>(WB_VSCROLL) ); nSortId = pHS->getID( "WB_SORT" ); - aWinBits.SetConstant( nSortId, sal::static_int_cast<INT32>(WB_SORT) ); + aWinBits.SetConstant( nSortId, sal::static_int_cast<sal_Int32>(WB_SORT) ); nDefaultId = pHS->getID( "WB_DEFBUTTON" ); - aWinBits.SetConstant( nDefaultId, sal::static_int_cast<INT32>(WB_DEFBUTTON) ); + aWinBits.SetConstant( nDefaultId, sal::static_int_cast<sal_Int32>(WB_DEFBUTTON) ); nRepeatId = pHS->getID( "WB_REPEAT" ); - aWinBits.SetConstant( nRepeatId, sal::static_int_cast<INT32>(WB_REPEAT) ); + aWinBits.SetConstant( nRepeatId, sal::static_int_cast<sal_Int32>(WB_REPEAT) ); nSVLookId = pHS->getID( "WB_SVLOOK" ); - aWinBits.SetConstant( nSVLookId, sal::static_int_cast<INT32>(WB_3DLOOK) ); + aWinBits.SetConstant( nSVLookId, sal::static_int_cast<sal_Int32>(WB_3DLOOK) ); nDropDownId = pHS->getID( "WB_DROPDOWN" ); - aWinBits.SetConstant( nDropDownId, sal::static_int_cast<INT32>(WB_DROPDOWN) ); + aWinBits.SetConstant( nDropDownId, sal::static_int_cast<sal_Int32>(WB_DROPDOWN) ); nPassWordId = pHS->getID( "WB_PASSWORD" ); - aWinBits.SetConstant( nPassWordId, sal::static_int_cast<INT32>(WB_PASSWORD) ); + aWinBits.SetConstant( nPassWordId, sal::static_int_cast<sal_Int32>(WB_PASSWORD) ); nReadOnlyId = pHS->getID( "WB_READONLY" ); - aWinBits.SetConstant( nReadOnlyId, sal::static_int_cast<INT32>(WB_READONLY) ); + aWinBits.SetConstant( nReadOnlyId, sal::static_int_cast<sal_Int32>(WB_READONLY) ); nAutoSizeId = pHS->getID( "WB_AUTOSIZE" ); - aWinBits.SetConstant( nAutoSizeId, sal::static_int_cast<INT32>(WB_AUTOSIZE) ); + aWinBits.SetConstant( nAutoSizeId, sal::static_int_cast<sal_Int32>(WB_AUTOSIZE) ); nSpinId = pHS->getID( "WB_SPIN" ); - aWinBits.SetConstant( nSpinId, sal::static_int_cast<INT32>(WB_SPIN) ); + aWinBits.SetConstant( nSpinId, sal::static_int_cast<sal_Int32>(WB_SPIN) ); nTabControlId = pHS->getID( "WB_DIALOGCONTROL" ); - aWinBits.SetConstant( nTabControlId, sal::static_int_cast<INT32>(WB_DIALOGCONTROL) ); + aWinBits.SetConstant( nTabControlId, sal::static_int_cast<sal_Int32>(WB_DIALOGCONTROL) ); nSimpleModeId = pHS->getID( "WB_SIMPLEMODE" ); - aWinBits.SetConstant( nSimpleModeId, sal::static_int_cast<INT32>(WB_SIMPLEMODE) ); + aWinBits.SetConstant( nSimpleModeId, sal::static_int_cast<sal_Int32>(WB_SIMPLEMODE) ); nDragId = pHS->getID( "WB_DRAG" ); - aWinBits.SetConstant( nDragId, sal::static_int_cast<INT32>(WB_DRAG) ); + aWinBits.SetConstant( nDragId, sal::static_int_cast<sal_Int32>(WB_DRAG) ); nScrollId = pHS->getID( "WB_SCROLL" ); - aWinBits.SetConstant( nScrollId, sal::static_int_cast<INT32>(WB_SCROLL) ); + aWinBits.SetConstant( nScrollId, sal::static_int_cast<sal_Int32>(WB_SCROLL) ); nZoomableId = pHS->getID( "WB_ZOOMABLE" ); - aWinBits.SetConstant( nZoomableId, sal::static_int_cast<INT32>(WB_ROLLABLE) ); + aWinBits.SetConstant( nZoomableId, sal::static_int_cast<sal_Int32>(WB_ROLLABLE) ); nHideWhenDeactivateId = pHS->getID( "WB_HIDEWHENDEACTIVATE" ); aWinBits.SetConstant( nHideWhenDeactivateId, 0 /*WB_HIDEWHENDEACTIVATE*/ ); nAutoHScrollId = pHS->getID( "WB_AUTOHSCROLL" ); - aWinBits.SetConstant( nAutoHScrollId, sal::static_int_cast<INT32>(WB_AUTOHSCROLL) ); + aWinBits.SetConstant( nAutoHScrollId, sal::static_int_cast<sal_Int32>(WB_AUTOHSCROLL) ); nAutoVScrollId = pHS->getID( "WB_AUTOVSCROLL" ); - aWinBits.SetConstant( nAutoVScrollId, sal::static_int_cast<INT32>(WB_AUTOVSCROLL) ); + aWinBits.SetConstant( nAutoVScrollId, sal::static_int_cast<sal_Int32>(WB_AUTOVSCROLL) ); nDDExtraWidthId = pHS->getID( "WB_DDEXTRAWIDTH" ); aWinBits.SetConstant( nDDExtraWidthId, 0 /*WB_DDEXTRAWIDTH*/ ); nWordBreakId = pHS->getID( "WB_WORDBREAK" ); - aWinBits.SetConstant( nWordBreakId, sal::static_int_cast<INT32>(WB_WORDBREAK) ); + aWinBits.SetConstant( nWordBreakId, sal::static_int_cast<sal_Int32>(WB_WORDBREAK) ); nLeftLabelId = pHS->getID( "WB_LEFTLABEL" ); aWinBits.SetConstant( nLeftLabelId, 0 /*WB_LEFTLABEL*/ ); nHasLinesId = pHS->getID( "WB_HASLINES" ); - aWinBits.SetConstant( nHasLinesId, sal::static_int_cast<INT32>(WB_HASLINES) ); + aWinBits.SetConstant( nHasLinesId, sal::static_int_cast<sal_Int32>(WB_HASLINES) ); nHasButtonsId = pHS->getID( "WB_HASBUTTONS" ); - aWinBits.SetConstant( nHasButtonsId, sal::static_int_cast<INT32>(WB_HASBUTTONS) ); + aWinBits.SetConstant( nHasButtonsId, sal::static_int_cast<sal_Int32>(WB_HASBUTTONS) ); nRectStyleId = pHS->getID( "WB_RECTSTYLE" ); - aWinBits.SetConstant( nRectStyleId, sal::static_int_cast<INT32>(WB_RECTSTYLE) ); + aWinBits.SetConstant( nRectStyleId, sal::static_int_cast<sal_Int32>(WB_RECTSTYLE) ); nLineSpacingId = pHS->getID( "WB_LINESPACING" ); - aWinBits.SetConstant( nLineSpacingId, sal::static_int_cast<INT32>(WB_LINESPACING) ); + aWinBits.SetConstant( nLineSpacingId, sal::static_int_cast<sal_Int32>(WB_LINESPACING) ); nSmallStyleId = pHS->getID( "WB_SMALLSTYLE" ); - aWinBits.SetConstant( nSmallStyleId, sal::static_int_cast<INT32>(WB_SMALLSTYLE) ); + aWinBits.SetConstant( nSmallStyleId, sal::static_int_cast<sal_Int32>(WB_SMALLSTYLE) ); nEnableResizingId = pHS->getID( "WB_ENABLERESIZING" ); aWinBits.SetConstant( nEnableResizingId, 0 /*WB_ENABLERESIZING*/ ); nDockableId = pHS->getID( "WB_DOCKABLE" ); - aWinBits.SetConstant( nDockableId, sal::static_int_cast<INT32>(WB_DOCKABLE) ); + aWinBits.SetConstant( nDockableId, sal::static_int_cast<sal_Int32>(WB_DOCKABLE) ); nScaleId = pHS->getID( "WB_SCALE" ); - aWinBits.SetConstant( nScaleId, sal::static_int_cast<INT32>(WB_SCALE) ); + aWinBits.SetConstant( nScaleId, sal::static_int_cast<sal_Int32>(WB_SCALE) ); nIgnoreTabId = pHS->getID( "WB_IGNORETAB" ); - aWinBits.SetConstant( nIgnoreTabId, sal::static_int_cast<INT32>(WB_IGNORETAB) ); + aWinBits.SetConstant( nIgnoreTabId, sal::static_int_cast<sal_Int32>(WB_IGNORETAB) ); nNoSplitDrawId = pHS->getID( "WB_NOSPLITDRAW" ); - aWinBits.SetConstant( nNoSplitDrawId, sal::static_int_cast<INT32>(WB_NOSPLITDRAW) ); + aWinBits.SetConstant( nNoSplitDrawId, sal::static_int_cast<sal_Int32>(WB_NOSPLITDRAW) ); nTopImageId = pHS->getID( "WB_TOPIMAGE" ); - aWinBits.SetConstant( nTopImageId, sal::static_int_cast<INT32>(WB_TOPIMAGE) ); + aWinBits.SetConstant( nTopImageId, sal::static_int_cast<sal_Int32>(WB_TOPIMAGE) ); nNoLabelId = pHS->getID( "WB_NOLABEL" ); - aWinBits.SetConstant( nNoLabelId, sal::static_int_cast<INT32>(WB_NOLABEL) ); + aWinBits.SetConstant( nNoLabelId, sal::static_int_cast<sal_Int32>(WB_NOLABEL) ); nVertId = pHS->getID( "WB_VERT" ); - aWinBits.SetConstant( nVertId, sal::static_int_cast<INT32>(WB_VERT) ); + aWinBits.SetConstant( nVertId, sal::static_int_cast<sal_Int32>(WB_VERT) ); nSysWinId = pHS->getID( "WB_SYSTEMWINDOW" ); - aWinBits.SetConstant( nSysWinId, sal::static_int_cast<INT32>(WB_SYSTEMWINDOW) ); + aWinBits.SetConstant( nSysWinId, sal::static_int_cast<sal_Int32>(WB_SYSTEMWINDOW) ); } { /********** I n i t B a s i c T y p e s **************************/ @@ -702,7 +702,7 @@ void RscTypCont::Init() // Clientvariablen einfuegen // Sysmodal aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nRepeatId ), LIST_APPEND ); nId = aNmTb.Put( "Repeat", VARNAME ); diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index 4a42bea138bf..2108b0f349dc 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -78,7 +78,7 @@ int KeyCompare( const void * pFirst, const void * pSecond ){ |* *************************************************************************/ RscNameTable::RscNameTable() { - bSort = TRUE; + bSort = sal_True; nEntries = 0; pTable = NULL; }; @@ -107,7 +107,7 @@ RscNameTable::~RscNameTable() { |* Letzte Aenderung MM 28.02.91 |* *************************************************************************/ -void RscNameTable::SetSort( BOOL bSorted ){ +void RscNameTable::SetSort( sal_Bool bSorted ){ bSort = bSorted; if( bSort && pTable){ // Schluesselwort Feld sortieren @@ -180,7 +180,7 @@ Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp, RscTop * pClass ) |* Letzte Aenderung MM 28.02.91 |* *************************************************************************/ -BOOL RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){ +sal_Bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){ KEY_STRUCT * pKey = NULL; KEY_STRUCT aSearchName; sal_uInt32 i; @@ -207,8 +207,8 @@ BOOL RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){ if( pKey ){ // Schluesselwort gefunden *pEle = *pKey; - return( TRUE ); + return( sal_True ); }; - return( FALSE ); + return( sal_False ); }; diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index 76ec4c551d52..c8e02d792c6b 100755 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -64,7 +64,7 @@ const char* StringContainer::putString( const char* pString ) /*************************************************************************/ int c; -BOOL bLastInclude;// War letztes Symbol INCLUDE +sal_Bool bLastInclude;// War letztes Symbol INCLUDE RscFileInst* pFI; RscTypCont* pTC; RscExpression * pExp; @@ -72,15 +72,15 @@ struct KeyVal { int nKeyWord; YYSTYPE aYYSType; } aKeyVal[ 1 ]; -BOOL bTargetDefined; +sal_Bool bTargetDefined; StringContainer* pStringContainer = NULL; /****************** C O D E **********************************************/ -UINT32 GetNumber(){ - UINT32 l = 0; - UINT32 nLog = 10; +sal_uInt32 GetNumber(){ + sal_uInt32 l = 0; + sal_uInt32 nLog = 10; if( '0' == c ){ c = pFI->GetFastChar(); @@ -119,7 +119,7 @@ int MakeToken( YYSTYPE * pTokenVal ){ int c1; char * pStr; - while( TRUE ){ // Kommentare und Leerzeichen ueberlesen + while( sal_True ){ // Kommentare und Leerzeichen ueberlesen while( isspace( c ) ) c = pFI->GetFastChar(); if( '/' == c ){ @@ -151,7 +151,7 @@ int MakeToken( YYSTYPE * pTokenVal ){ } if( bLastInclude ){ - bLastInclude = FALSE; //Zuruecksetzten + bLastInclude = sal_False; //Zuruecksetzten if( '<' == c ){ OStringBuffer aBuf( 256 ); c = pFI->GetFastChar(); @@ -169,7 +169,7 @@ int MakeToken( YYSTYPE * pTokenVal ){ if( c == '"' ) { OStringBuffer aBuf( 256 ); - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; while( !bDone && !pFI->IsEof() && c ) { c = pFI->GetFastChar(); @@ -187,7 +187,7 @@ int MakeToken( YYSTYPE * pTokenVal ){ // see rscyacc.y } else - bDone = TRUE; + bDone = sal_True; } else if( c == '\\' ) { @@ -240,10 +240,10 @@ int MakeToken( YYSTYPE * pTokenVal ){ pTokenVal->constname.nValue = aKey.yylval; break; case BOOLEAN: - pTokenVal->svbool = (BOOL)aKey.yylval; + pTokenVal->svbool = (sal_Bool)aKey.yylval; break; case INCLUDE: - bLastInclude = TRUE; + bLastInclude = sal_True; default: pTokenVal->value = aKey.yylval; }; @@ -307,7 +307,7 @@ int yylex() #endif { if( bTargetDefined ) - bTargetDefined = FALSE; + bTargetDefined = sal_False; else aKeyVal[ 0 ].nKeyWord = MakeToken( &aKeyVal[ 0 ].aYYSType ); @@ -335,10 +335,10 @@ void InitParser( RscFileInst * pFileInst ) pFI = pFileInst; pStringContainer = new StringContainer(); pExp = NULL; //fuer MacroParser - bTargetDefined = FALSE; + bTargetDefined = sal_False; // Anfangszeichen initialisieren - bLastInclude = FALSE; + bLastInclude = sal_False; c = pFI->GetFastChar(); } @@ -364,7 +364,7 @@ void IncludeParser( RscFileInst * pFileInst ) int nToken; // Wert des Tokens YYSTYPE aYYSType; // Daten des Tokens RscFile * pFName; // Filestruktur - ULONG lKey; // Fileschluessel + sal_uLong lKey; // Fileschluessel RscTypCont * pTypCon = pFileInst->pTypCont; pFName = pTypCon->aFileTab.Get( pFileInst->GetFileIndex() ); @@ -420,7 +420,7 @@ RscExpression * MacroParser( RscFileInst & rFileInst ) //Ziel auf macro_expression setzen aKeyVal[ 0 ].nKeyWord = MACROTARGET; - bTargetDefined = TRUE; + bTargetDefined = sal_True; aError = yyparse(); pExpression = pExp; diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx index 06c04f4126a3..ebda82aa4fdd 100644 --- a/rsc/source/parser/rsclex.hxx +++ b/rsc/source/parser/rsclex.hxx @@ -76,7 +76,7 @@ class ObjectStack { ObjectStack () { pRoot = NULL; } const RSCINST & Top () { return pRoot->aInst; } - BOOL IsEmpty() { return( pRoot == NULL ); } + sal_Bool IsEmpty() { return( pRoot == NULL ); } void IncTupelRec() { pRoot->nTupelRec++; } void DecTupelRec() { pRoot->nTupelRec--; } sal_uInt32 TupelRecCount() const { return pRoot->nTupelRec; } diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx index 22606e2f8bf2..c7c09f8275da 100644 --- a/rsc/source/parser/rscpar.cxx +++ b/rsc/source/parser/rscpar.cxx @@ -52,7 +52,7 @@ void RscFileInst::Init() *pLine = '\0'; nScanPos = 0; cLastChar = '\0'; - bEof = FALSE; + bEof = sal_False; }; /************************************************************************* @@ -64,8 +64,8 @@ void RscFileInst::Init() |* Letzte Aenderung MM 06.06.91 |* *************************************************************************/ -RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc, - ULONG lFIndex, FILE * fFile ) +RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, + sal_uLong lFIndex, FILE * fFile ) { pTypCont = pTC; Init(); @@ -79,8 +79,8 @@ RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc, pInput = (char *)rtl_allocateMemory( nInputBufLen ); } -RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc, - ULONG lFIndex, const ByteString& rBuf ) +RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, + sal_uLong lFIndex, const ByteString& rBuf ) { pTypCont = pTC; Init(); @@ -128,7 +128,7 @@ int RscFileInst::GetChar() else if( nInputPos >= nInputEndPos && nInputEndPos != nInputBufLen ) { // Dateiende - bEof = TRUE; + bEof = sal_True; return 0; } else diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx index 0d5cc8faef0e..63be87f43649 100644 --- a/rsc/source/parser/rscyacc.cxx +++ b/rsc/source/parser/rscyacc.cxx @@ -63,7 +63,7 @@ RSCINST GetVarInst( const RSCINST & rInst, const char * pVarName ) return( aInst ); } -void SetNumber( const RSCINST & rInst, const char * pVarName, INT32 lValue ) +void SetNumber( const RSCINST & rInst, const char * pVarName, sal_Int32 lValue ) { RSCINST aInst; @@ -79,7 +79,7 @@ void SetNumber( const RSCINST & rInst, const char * pVarName, INT32 lValue ) } void SetConst( const RSCINST & rInst, const char * pVarName, - Atom nValueId, INT32 nVal ) + Atom nValueId, sal_Int32 nVal ) { RSCINST aInst; @@ -111,11 +111,11 @@ void SetString( const RSCINST & rInst, const char * pVarName, const char * pStr RscId MakeRscId( RscExpType aExpType ) { if( !aExpType.IsNothing() ){ - INT32 lValue; + sal_Int32 lValue; if( !aExpType.Evaluate( &lValue ) ) pTC->pEH->Error( ERR_ZERODIVISION, NULL, RscId() ); - if( lValue < 1 || lValue > (INT32)0x7FFF ) + if( lValue < 1 || lValue > (sal_Int32)0x7FFF ) { pTC->pEH->Error( ERR_IDRANGE, NULL, RscId(), ByteString::CreateFromInt32( lValue ).GetBuffer() ); @@ -129,7 +129,7 @@ RscId MakeRscId( RscExpType aExpType ) return RscId(); } -BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember ) +sal_Bool DoClassHeader( RSCHEADER * pHeader, sal_Bool bMember ) { RSCINST aCopyInst; RscId aName1 = MakeRscId( pHeader->nName1 ); @@ -177,7 +177,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember ) { if( S.IsEmpty() ) { - if( (INT32)aName1 < 256 ) + if( (sal_Int32)aName1 < 256 ) pTC->pEH->Error( WRN_GLOBALID, pHeader->pClass, aName1 ); if( aCopyInst.IsInst() ) @@ -199,7 +199,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember ) RSCINST aTmpI; ERRTYPE aError; - if( (INT32)aName1 >= 256 && aName1.IsId() ) + if( (sal_Int32)aName1 >= 256 && aName1.IsId() ) pTC->pEH->Error( WRN_LOCALID, pHeader->pClass, aName1 ); aError = S.Top().pClass->GetElement( S.Top(), aName1, pHeader->pClass, aCopyInst, &aTmpI ); @@ -217,7 +217,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember ) pHeader->pClass, RSCINST(), &aTmpI ); if( !aTmpI.IsInst() ) - return( FALSE ); + return( sal_False ); } S.Push( aTmpI ); }; @@ -230,7 +230,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember ) pTC->pEH->Error( aError, S.Top().pClass, aName1 ); } - return( TRUE ); + return( sal_True ); } RSCINST GetFirstTupelEle( const RSCINST & rTop ) diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index a522d7416782..329884e498b6 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -39,7 +39,7 @@ Atom varid; struct { Atom hashid; - INT32 nValue; + sal_Int32 nValue; } constname; RscTop * pClass; RSCHEADER header; @@ -47,11 +47,11 @@ CLASS_DATA pData; RscTop * pClass; } instance; - INT32 value; - USHORT ushort; + sal_Int32 value; + sal_uInt16 ushort; short exp_short; char * string; - BOOL svbool; + sal_Bool svbool; REF_ENUM copyref; RscDefine * defineele; CharSet charset; @@ -130,7 +130,7 @@ resource_definitions | MACROTARGET macro_expression { RscExpType aExpType; - INT32 lValue; + sal_Int32 lValue; aExpType.cType = RSCEXP_NOTHING; pExp = new RscExpression( aExpType, '+', $2 ); @@ -143,13 +143,13 @@ resource_definition : line_number | '#' DEFINE SYMBOL macro_expression { - BOOL bError = FALSE; + sal_Bool bError = sal_False; if( $4.IsNumber() ){ if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(), ByteString( $3 ), $4.GetLong(), LIST_APPEND ) ) - bError = TRUE; + bError = sal_True; } else if( $4.IsDefinition() ){ RscExpType aExpType; @@ -162,13 +162,13 @@ resource_definition if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(), ByteString( $3 ), pExpr, LIST_APPEND ) ) - bError = TRUE; + bError = sal_True; } else if( $4.IsExpression() ){ if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(), ByteString( $3 ), $4.aExp.pExp, LIST_APPEND ) ) - bError = TRUE; + bError = sal_True; } if( bError ){ @@ -200,7 +200,7 @@ resource_definition new_class_definition_header : CLASS SYMBOL id_expression ':' CLASSNAME { - INT32 lType; + sal_Int32 lType; $3.Evaluate( &lType ); @@ -319,7 +319,7 @@ class_definition class_header : class_header_body { - if( !DoClassHeader( &$1, FALSE ) ) + if( !DoClassHeader( &$1, sal_False ) ) return( ERR_ERROR ); $$ = $1; } @@ -528,7 +528,7 @@ var_header_class { RSCINST aInst; - aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST(), FALSE, $3.pClass ); + aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST(), sal_False, $3.pClass ); if( aInst.pData ) S.Push( aInst ); @@ -539,7 +539,7 @@ var_header_class return( ERR_ERROR ); }; - if( !DoClassHeader( &$3, TRUE ) ) + if( !DoClassHeader( &$3, sal_True ) ) return( ERR_ERROR ); $$ = $3; } @@ -567,7 +567,7 @@ var_header_class pHS->getString( $1 ) ); return( ERR_ERROR ); }; - if( !DoClassHeader( &$6, TRUE ) ) + if( !DoClassHeader( &$6, sal_True ) ) return( ERR_ERROR ); $$ = $6; } @@ -596,7 +596,7 @@ var_header_class pHS->getString( $1 ) ); return( ERR_ERROR ); }; - if( !DoClassHeader( &$6, TRUE ) ) + if( !DoClassHeader( &$6, sal_True ) ) return( ERR_ERROR ); $$ = $6; } @@ -784,7 +784,7 @@ list var_bodysimple : macro_expression { - INT32 l; + sal_Int32 l; ERRTYPE aError; if( !$1.Evaluate( &l ) ) @@ -1064,7 +1064,7 @@ id_expression | macro_expression { // pExpession auswerten und loeschen if( RSCEXP_EXP == $1.cType ){ - INT32 lValue; + sal_Int32 lValue; if( !$1.Evaluate( &lValue ) ) pTC->pEH->Error( ERR_ZERODIVISION, NULL, RscId() ); @@ -1094,8 +1094,8 @@ line_number pFI->SetLineNo( $3 ); pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( ByteString( $4 ) ) ); pFName = pTC->aFileTab.Get( pFI->GetFileIndex() ); - pFName->bLoaded = TRUE; - pFName->bScanned = TRUE; + pFName->bLoaded = sal_True; + pFName->bScanned = sal_True; } | '#' NUMBER STRING DUMMY_NUMBER { @@ -1104,8 +1104,8 @@ line_number pFI->SetLineNo( $2 ); pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( ByteString( $3 ) ) ); pFName = pTC->aFileTab.Get( pFI->GetFileIndex() ); - pFName->bLoaded = TRUE; - pFName->bScanned = TRUE; + pFName->bLoaded = sal_True; + pFName->bScanned = sal_True; } | '#' NUMBER { diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index a2841dd9765b..e25f68cff10a 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -89,11 +89,11 @@ |* |* Beschreibung *************************************************************************/ -static BOOL CallPrePro( const ByteString& rPrePro, +static sal_Bool CallPrePro( const ByteString& rPrePro, const ByteString& rInput, const ByteString& rOutput, RscPtrPtr * pCmdLine, - BOOL bResponse ) + sal_Bool bResponse ) { RscPtrPtr aNewCmdL; // Kommandozeile RscPtrPtr aRespCmdL; // Kommandozeile @@ -193,9 +193,9 @@ static BOOL CallPrePro( const ByteString& rPrePro, unlink( aRspFileName.GetBuffer() ); #endif if ( nExit ) - return FALSE; + return sal_False; - return TRUE; + return sal_True; } @@ -204,7 +204,7 @@ static BOOL CallPrePro( const ByteString& rPrePro, |* |* Beschreibung *************************************************************************/ -static BOOL CallRsc2( ByteString aRsc2Name, +static sal_Bool CallRsc2( ByteString aRsc2Name, RscStrList * pInputList, ByteString aSrsName, RscPtrPtr * pCmdLine ) @@ -310,8 +310,8 @@ static BOOL CallRsc2( ByteString aRsc2Name, unlink( aRspFileName.GetBuffer() ); #endif if( nExit ) - return( FALSE ); - return( TRUE ); + return( sal_False ); + return( sal_True ); } /************************************************************************* @@ -325,11 +325,11 @@ static BOOL CallRsc2( ByteString aRsc2Name, *************************************************************************/ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { - BOOL bPrePro = TRUE; - BOOL bResFile = TRUE; - BOOL bHelp = FALSE; - BOOL bError = FALSE; - BOOL bResponse = FALSE; + sal_Bool bPrePro = sal_True; + sal_Bool bResFile = sal_True; + sal_Bool bHelp = sal_False; + sal_Bool bError = sal_False; + sal_Bool bResponse = sal_False; ByteString aSolarbin(getenv("SOLARBINDIR")); ByteString aDelim("/"); ByteString aPrePro; //( aSolarbin + aDelim + ByteString("rscpp")); @@ -362,7 +362,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) ppStr = (char **)aCmdLine.GetBlock(); ppStr++; i = 1; - BOOL bSetSrs = FALSE; + sal_Bool bSetSrs = sal_False; while( ppStr && i < (aCmdLine.GetCount() -1) ) { if( '-' == **ppStr ) @@ -370,20 +370,20 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( !rsc_stricmp( (*ppStr) + 1, "p" ) || !rsc_stricmp( (*ppStr) + 1, "l" ) ) { // kein Preprozessor - bPrePro = FALSE; + bPrePro = sal_False; } else if( !rsc_stricmp( (*ppStr) + 1, "r" ) || !rsc_stricmp( (*ppStr) + 1, "s" ) ) { // erzeugt kein .res-file - bResFile = FALSE; + bResFile = sal_False; } else if( !rsc_stricmp( (*ppStr) + 1, "h" ) ) { // Hilfe anzeigen - bHelp = TRUE; + bHelp = sal_True; } else if( !rsc_strnicmp( (*ppStr) + 1, "presponse", 9 ) ) { // anderer Name fuer den Preprozessor - bResponse = TRUE; + bResponse = sal_True; } else if( !rsc_strnicmp( (*ppStr) + 1, "pp=", 3 ) ) { // anderer Name fuer den Preprozessor @@ -399,7 +399,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) ) { // anderer Name fuer .srs-file - bSetSrs = TRUE; + bSetSrs = sal_True; aSrsName = (*ppStr); } } @@ -426,8 +426,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( bHelp ) { - bPrePro = FALSE; - bResFile = FALSE; + bPrePro = sal_False; + bResFile = sal_False; }; if( bPrePro && aInputList.Count() ) { @@ -440,7 +440,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( !CallPrePro( aPrePro, *pString, aTmpName, &aCmdLine, bResponse ) ) { printf( "Error starting preprocessor\n" ); - bError = TRUE; + bError = sal_True; break; } aTmpList.Insert( new ByteString( aTmpName ), CONTAINER_APPEND ); @@ -456,7 +456,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( !bHelp ) { printf( "Error starting rsc2 compiler\n" ); - bError = TRUE; + bError = sal_True; } }; }; diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx index d04903ea8692..d4f28f598e3f 100644 --- a/rsc/source/res/rscall.cxx +++ b/rsc/source/res/rscall.cxx @@ -49,11 +49,11 @@ Atom nRsc_EXTRADATA = InvalidAtom; void InitRscCompiler() { - pStdParType = new ByteString( "( const ResId & rResId, BOOL" ); + pStdParType = new ByteString( "( const ResId & rResId, sal_Bool" ); pStdPar1 = new ByteString( '(' ); pStdPar2 = new ByteString( '(' ); - pWinParType = new ByteString( "( Window * pParent, const ResId & rResId, BOOL" ); + pWinParType = new ByteString( "( Window * pParent, const ResId & rResId, sal_Bool" ); pWinPar1 = new ByteString( "( pParent," ); pWinPar2 = new ByteString( "( this," ); nRefDeep = 10; diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx index 5e9023a83e83..cda959ebb79c 100644 --- a/rsc/source/res/rscarray.cxx +++ b/rsc/source/res/rscarray.cxx @@ -176,7 +176,7 @@ static RscInstNode * Create( RscInstNode * pNode ) } RSCINST RscArray::Create( RSCINST * pInst, const RSCINST & rDflt, - BOOL bOwnClass ) + sal_Bool bOwnClass ) { RSCINST aInst; RscArrayInst * pClassData; @@ -245,7 +245,7 @@ void RscArray::Destroy( const RSCINST & rInst ) ERRTYPE RscArray::GetValueEle ( const RSCINST & rInst, - INT32 lValue, + sal_Int32 lValue, RscTop * pCreateClass, RSCINST * pGetInst ) @@ -313,7 +313,7 @@ ERRTYPE RscArray::GetArrayEle RSCINST * pGetInst ) { - INT32 lValue; + sal_Int32 lValue; if( !pTypeClass->GetConstValue( nId, &lValue ) ) { // nicht gefunden return ERR_ARRAY_INVALIDINDEX; @@ -331,31 +331,31 @@ ERRTYPE RscArray::GetArrayEle |* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ -static BOOL IsConsistent( RscInstNode * pNode, RscInconsList * pList ) +static sal_Bool IsConsistent( RscInstNode * pNode, RscInconsList * pList ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if( pNode ) { bRet = pNode->aInst.pClass->IsConsistent( pNode->aInst, pList ); if( !IsConsistent( pNode->Left(), pList ) ) - bRet = FALSE; + bRet = sal_False; if( !IsConsistent( pNode->Right(), pList ) ) - bRet = FALSE; + bRet = sal_False; } return bRet; } -BOOL RscArray::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) +sal_Bool RscArray::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) { RscArrayInst * pClassData; - BOOL bRet; + sal_Bool bRet; bRet = RscTop::IsConsistent( rInst, pList ); pClassData = (RscArrayInst *)(rInst.pData + nOffInstData); if( !::IsConsistent( pClassData->pNode, pList ) ) - bRet = FALSE; + bRet = sal_False; return( bRet ); } @@ -399,9 +399,9 @@ void RscArray::SetToDefault( const RSCINST & rInst ) |* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ -static BOOL IsDefault( RscInstNode * pNode ) +static sal_Bool IsDefault( RscInstNode * pNode ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if( pNode ) { @@ -414,13 +414,13 @@ static BOOL IsDefault( RscInstNode * pNode ) return bRet; } -BOOL RscArray::IsDefault( const RSCINST & rInst ) +sal_Bool RscArray::IsDefault( const RSCINST & rInst ) { RscArrayInst * pClassData; pClassData = (RscArrayInst *)(rInst.pData + nOffInstData); - BOOL bRet = ::IsDefault( pClassData->pNode ); + sal_Bool bRet = ::IsDefault( pClassData->pNode ); if( bRet ) bRet = RscTop::IsDefault( rInst ); @@ -436,9 +436,9 @@ BOOL RscArray::IsDefault( const RSCINST & rInst ) |* Letzte Aenderung MM 15.01.92 |* *************************************************************************/ -static BOOL IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef ) +static sal_Bool IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if( pNode ) { @@ -451,10 +451,10 @@ static BOOL IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef ) return bRet; } -BOOL RscArray::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) +sal_Bool RscArray::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { RscArrayInst * pClassData; - BOOL bRet; + sal_Bool bRet; bRet = RscTop::IsValueDefault( rInst, pDef ); @@ -569,7 +569,7 @@ void RscArray::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* Beschreibung *************************************************************************/ ERRTYPE RscArray::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { ERRTYPE aError; RscArrayInst * pClassData; @@ -686,7 +686,7 @@ void RscClassArray::WriteSrc( const RSCINST & rInst, FILE * fOutput, *************************************************************************/ ERRTYPE RscClassArray::WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, const RscId & aId, - sal_uInt32 nDeep, BOOL bExtra ) + sal_uInt32 nDeep, sal_Bool bExtra ) { // Eigenen Typ schreiben return GetSuperClass()->WriteRcHeader( rInst, aMem, pTC, aId, diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 877d11afee83..465e55a1e2cd 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -132,7 +132,7 @@ RSCINST RscClass::GetInstData ( CLASS_DATA pData, sal_uInt32 nEle, - BOOL bGetCopy + sal_Bool bGetCopy ) { RSCINST aInst; @@ -197,15 +197,15 @@ CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle ) |* Letzte Aenderung MM 22.07.91 |* *************************************************************************/ -void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, BOOL bSet ) +void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, sal_Bool bSet ) { RscClassInst * pClass; pClass = (RscClassInst *)(pData + nSuperSize ); if( bSet ) - pClass->nVarDflt |= ((ULONG)1 << nEle); + pClass->nVarDflt |= ((sal_uLong)1 << nEle); else - pClass->nVarDflt &= ~((ULONG)1 << nEle); + pClass->nVarDflt &= ~((sal_uLong)1 << nEle); } /************************************************************************* @@ -217,23 +217,23 @@ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, BOOL bSet ) |* Letzte Aenderung MM 08.01.92 |* *************************************************************************/ -BOOL RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) +sal_Bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) { RscClassInst * pClass; - BOOL bRet; + sal_Bool bRet; pClass = (RscClassInst *)(pData + nSuperSize ); - if( pClass->nVarDflt & ((ULONG)1 << nEle) ) - bRet = TRUE; + if( pClass->nVarDflt & ((sal_uLong)1 << nEle) ) + bRet = sal_True; else - bRet = FALSE; + bRet = sal_False; /* { //Variablenname ist Default RSCINST aTmpI; - aTmpI = GetInstData( pData, nEle, TRUE ); + aTmpI = GetInstData( pData, nEle, sal_True ); if( aTmpI.IsInst() && !aTmpI.pClass->IsDefault( aTmpI ) ) - bRet = FALSE; + bRet = sal_False; } */ return bRet; @@ -252,7 +252,7 @@ RSCINST RscClass::Create ( RSCINST * pInst, const RSCINST & rDflt, - BOOL bOwnClass + sal_Bool bOwnClass ) { sal_uInt32 i; @@ -276,11 +276,11 @@ RSCINST RscClass::Create ((RscClassInst *)(aInst.pData + nSuperSize))->nVarDflt = ((RscClassInst *)(rDflt.pData + nSuperSize))->nVarDflt; else - ((RscClassInst *)(aInst.pData + nSuperSize))->nVarDflt = ~((ULONG)0); + ((RscClassInst *)(aInst.pData + nSuperSize))->nVarDflt = ~((sal_uLong)0); for( i = 0; i < nEntries; i++ ) { - aDfltI = GetInstData( bOwnClass ? rDflt.pData : NULL, i, TRUE ); + aDfltI = GetInstData( bOwnClass ? rDflt.pData : NULL, i, sal_True ); if( (VAR_POINTER & pVarTypeList[ i ].nVarType) && !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) ) @@ -304,7 +304,7 @@ RSCINST RscClass::Create } else { - aMemInst = GetInstData( aInst.pData, i, TRUE ); + aMemInst = GetInstData( aInst.pData, i, sal_True ); aMemInst = aMemInst.pClass->Create( &aMemInst, aDfltI ); }; } @@ -331,7 +331,7 @@ void RscClass::Destroy( const RSCINST & rInst ) { RSCINST aTmpI; - aTmpI = GetInstData( rInst.pData, i, TRUE ); + aTmpI = GetInstData( rInst.pData, i, sal_True ); if( aTmpI.IsInst() ) { // Objekt loeschen @@ -400,7 +400,7 @@ ERRTYPE RscClass::SetVariable } nEntries++; - if( nEntries > (sizeof( ULONG ) * 8) ) + if( nEntries > (sizeof( sal_uLong ) * 8) ) { // Bereich fuer Default zu klein RscExit( 16 ); @@ -440,7 +440,7 @@ RSCINST RscClass::GetVariable const RSCINST & rInst, Atom nVarName, const RSCINST & rInitInst, - BOOL bInitDflt, + sal_Bool bInitDflt, RscTop * pCreateClass ) { @@ -500,7 +500,7 @@ RSCINST RscClass::GetVariable } }; // auf nicht Default setzen - SetVarDflt( rInst.pData, i, FALSE ); + SetVarDflt( rInst.pData, i, sal_False ); return( aTmpI ); }; @@ -539,11 +539,11 @@ RSCINST RscClass::GetCopyVar if( IsDflt( rInst.pData, i ) ) { // mit Variablen Default initialiaieren - aVarI = GetVariable( rInst, nVarName, RSCINST(), TRUE ); - SetVarDflt( rInst.pData, i, TRUE ); + aVarI = GetVariable( rInst, nVarName, RSCINST(), sal_True ); + SetVarDflt( rInst.pData, i, sal_True ); } else - aVarI = GetInstData( rInst.pData, i, TRUE ); + aVarI = GetInstData( rInst.pData, i, sal_True ); }; return aVarI ; @@ -559,11 +559,11 @@ RSCINST RscClass::GetCopyVar |* Beschreibung |* *************************************************************************/ -BOOL RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) +sal_Bool RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) { sal_uInt32 i = 0; RSCINST aTmpI; - BOOL bRet; + sal_Bool bRet; bRet = RscTop::IsConsistent( rInst, pList ); @@ -571,11 +571,11 @@ BOOL RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) { if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) ) { - aTmpI = GetInstData( rInst.pData, i, TRUE ); + aTmpI = GetInstData( rInst.pData, i, sal_True ); if( aTmpI.IsInst() ) if( ! aTmpI.pClass->IsConsistent( aTmpI, pList ) ) - bRet = FALSE; + bRet = sal_False; } }; @@ -603,12 +603,12 @@ void RscClass::SetToDefault( const RSCINST & rInst ) // auf Default gesetzt if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) ) { - aTmpI = GetInstData( rInst.pData, i, TRUE ); + aTmpI = GetInstData( rInst.pData, i, sal_True ); if( aTmpI.IsInst() ) aTmpI.pClass->SetToDefault( aTmpI ); } } - pClass->nVarDflt = ~((ULONG)0); // alles auf Default + pClass->nVarDflt = ~((sal_uLong)0); // alles auf Default RscTop::SetToDefault( rInst ); } @@ -620,7 +620,7 @@ void RscClass::SetToDefault( const RSCINST & rInst ) |* Beschreibung |* *************************************************************************/ -BOOL RscClass::IsDefault( const RSCINST & rInst ) +sal_Bool RscClass::IsDefault( const RSCINST & rInst ) { sal_uInt32 i; RSCINST aTmpI; @@ -631,7 +631,7 @@ BOOL RscClass::IsDefault( const RSCINST & rInst ) // auf Default untersucht if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) ) if( !IsDflt( rInst.pData, i ) ) - return( FALSE ); + return( sal_False ); }; return( RscTop::IsDefault( rInst ) ); @@ -670,24 +670,24 @@ RSCINST RscClass::GetDefault( Atom nVarId ) |* Beschreibung |* *************************************************************************/ -BOOL RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ) +sal_Bool RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ) { RSCINST aTmpI; - aTmpI = GetInstData( pData, nEle, TRUE ); + aTmpI = GetInstData( pData, nEle, sal_True ); if( aTmpI.IsInst() ) { if( VAR_SVDYNAMIC & pVarTypeList[ nEle ].nVarType ) - return FALSE; + return sal_False; if( aTmpI.pClass == pVarTypeList[ nEle ].pClass ) //sie haben auch die gleiche Klasse return aTmpI.pClass->IsValueDefault( aTmpI, GetDfltData( nEle ) ); else - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } /************************************************************************* @@ -697,39 +697,39 @@ BOOL RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ) |* Beschreibung |* *************************************************************************/ -BOOL RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) +sal_Bool RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { sal_uInt32 i = 0; RSCINST aTmpI; RSCINST aDfltI; if( !RscTop::IsValueDefault( rInst, pDef ) ) - return FALSE; + return sal_False; if( pDef ) { for( i = 0; i < nEntries; i++ ) { - aTmpI = GetInstData( rInst.pData, i, TRUE ); + aTmpI = GetInstData( rInst.pData, i, sal_True ); if( aTmpI.IsInst() ) { if( aTmpI.pClass != pVarTypeList[ i ].pClass ) //sie haben nicht die gleiche Klasse - return FALSE; + return sal_False; - aDfltI = GetInstData( pDef, i, TRUE ); + aDfltI = GetInstData( pDef, i, sal_True ); if( !aDfltI.IsInst() ) aDfltI.pData = GetDfltData( i ); if( !aTmpI.pClass->IsValueDefault( aTmpI, aDfltI.pData ) ) - return FALSE; + return sal_False; } } } else - return FALSE; + return sal_False; - return TRUE; + return sal_True; } /************************************************************************* @@ -749,12 +749,12 @@ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName ) if( i < nEntries ) { - aTmpI = GetInstData( rInst.pData, i, TRUE ); + aTmpI = GetInstData( rInst.pData, i, sal_True ); if( aTmpI.IsInst() ) { aTmpI.pClass->Destroy( aTmpI ); aTmpI.pClass->Create( &aTmpI, RSCINST() ); - SetVarDflt( rInst.pData, i, TRUE ); + SetVarDflt( rInst.pData, i, sal_True ); } } else //In Superklasse nach Variable suchen @@ -805,20 +805,20 @@ void RscClass::WriteSrc if( !IsDflt( rInst.pData, i ) ) { - aTmpI = GetInstData( rInst.pData, i, TRUE ); + aTmpI = GetInstData( rInst.pData, i, sal_True ); aTmpI.pClass->WriteSrcHeader( aTmpI, fOutput, pTC, nTab, RscId(), pVarName ); } fprintf( fOutput, "( " ); - aTmpI = GetInstData( rInst.pData, i+1, TRUE ); + aTmpI = GetInstData( rInst.pData, i+1, sal_True ); if( !aTmpI.IsInst() ) aTmpI.pData = GetDfltData( i+1 ); aTmpI.pClass->WriteSrcHeader( aTmpI, fOutput, pTC, nTab, RscId(), pVarName ); fprintf( fOutput, ", " ); - aTmpI = GetInstData( rInst.pData, i+2, TRUE ); + aTmpI = GetInstData( rInst.pData, i+2, sal_True ); if( !aTmpI.IsInst() ) aTmpI.pData = GetDfltData( i+2 ); aTmpI.pClass->WriteSrcHeader( @@ -830,7 +830,7 @@ void RscClass::WriteSrc else if( !IsDflt( rInst.pData, i ) && !IsValueDflt( rInst.pData, i ) ) { - aTmpI = GetInstData( rInst.pData, i, TRUE ); + aTmpI = GetInstData( rInst.pData, i, sal_True ); if( aTmpI.IsInst() ) { @@ -858,7 +858,7 @@ void RscClass::WriteSrc |* Beschreibung |* *************************************************************************/ -INT32 RscClass::GetCorrectValues +sal_Int32 RscClass::GetCorrectValues ( const RSCINST & rInst, sal_uInt32 nVarPos, @@ -866,11 +866,11 @@ INT32 RscClass::GetCorrectValues RscTypCont * pTC ) { - INT32 nLang = 0; - INT32 nBaseValue; + sal_Int32 nLang = 0; + sal_Int32 nBaseValue; // Basiswert holen - RSCINST aTmpI = GetInstData( rInst.pData, nVarPos, TRUE ); + RSCINST aTmpI = GetInstData( rInst.pData, nVarPos, sal_True ); aTmpI.pClass->GetNumber( aTmpI, &nBaseValue ); // Sprach Delta holen @@ -878,8 +878,8 @@ INT32 RscClass::GetCorrectValues if( aTmpI.IsInst() ) { RscWriteRc aMem; - aTmpI.pClass->WriteRc( aTmpI, aMem, pTC, 0, FALSE ); - nLang = (INT32)aMem.GetShort( nTupelIdx * sizeof(sal_uInt16) ); + aTmpI.pClass->WriteRc( aTmpI, aMem, pTC, 0, sal_False ); + nLang = (sal_Int32)aMem.GetShort( nTupelIdx * sizeof(sal_uInt16) ); } return nLang + nBaseValue; @@ -891,7 +891,7 @@ ERRTYPE RscClass::WriteInstRc RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, - BOOL bExtra + sal_Bool bExtra ) { sal_uInt32 i = 0; @@ -920,35 +920,35 @@ ERRTYPE RscClass::WriteInstRc { if( nRsc_X == pVarTypeList[ i ].nVarName ) { - INT32 nVal = GetCorrectValues( rInst, i, 0, pTC ); + sal_Int32 nVal = GetCorrectValues( rInst, i, 0, pTC ); rMem.Put( nVal ); } else if( nRsc_Y == pVarTypeList[ i ].nVarName ) { - INT32 nVal = GetCorrectValues( rInst, i, 1, pTC ); + sal_Int32 nVal = GetCorrectValues( rInst, i, 1, pTC ); rMem.Put( nVal ); } else if( nRsc_WIDTH == pVarTypeList[ i ].nVarName ) { - INT32 nVal = GetCorrectValues( rInst, i, 2, pTC ); + sal_Int32 nVal = GetCorrectValues( rInst, i, 2, pTC ); rMem.Put( nVal ); } else if( nRsc_HEIGHT == pVarTypeList[ i ].nVarName ) { - INT32 nVal = GetCorrectValues( rInst, i, 3, pTC ); + sal_Int32 nVal = GetCorrectValues( rInst, i, 3, pTC ); rMem.Put( nVal ); } else { - aTmpI = GetInstData( rInst.pData, i, TRUE ); - // Nur an Variable Extradata bExtra nicht auf FALSE + aTmpI = GetInstData( rInst.pData, i, sal_True ); + // Nur an Variable Extradata bExtra nicht auf sal_False // setzen aError = aTmpI.pClass-> WriteRcHeader( aTmpI, rMem, pTC, RscId(), nDeep, (nRsc_EXTRADATA == pVarTypeList[ i ].nVarName) - ? bExtra : FALSE ); + ? bExtra : sal_False ); } sal_uInt32 nMask = rMem.GetLong( nMaskOff ); nMask |= pVarTypeList[ i ].nMask; @@ -962,15 +962,15 @@ ERRTYPE RscClass::WriteInstRc aTmpI.pData = GetDfltData( i ); } else - aTmpI = GetInstData( rInst.pData, i, TRUE ); - // Nur an Variable Extradata bExtra nicht auf FALSE + aTmpI = GetInstData( rInst.pData, i, sal_True ); + // Nur an Variable Extradata bExtra nicht auf sal_False // setzen aError = aTmpI.pClass-> WriteRcHeader( aTmpI, rMem, pTC, RscId(), nDeep, (nRsc_EXTRADATA == pVarTypeList[ i ].nVarName) - ? bExtra : FALSE ); + ? bExtra : sal_False ); } } } @@ -991,7 +991,7 @@ ERRTYPE RscClass::WriteRc RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, - BOOL bExtra + sal_Bool bExtra ) { ERRTYPE aError; @@ -1067,7 +1067,7 @@ void RscClass::WriteRcCtor( FILE * fOutput, RscTypCont * pTC ) fprintf( fOutput, "\tsal_uInt32\tnObjMask;\n" ); fprintf( fOutput, "\tsal_uInt32\tnOffset = 0;\n" ); fprintf( fOutput, "\tBYTE *\tpResData;\n\n" ); - fprintf( fOutput, "\tpResData = (BYTE *)GetClassRes();\n\n" ); + fprintf( fOutput, "\tpResData = (tBYTE *)GetClassRes();\n\n" ); fprintf( fOutput, "\tnObjMask = *(sal_uInt32*)pResData;\n" ); fprintf( fOutput, "\tnOffset += 4;\n\n" ); @@ -1111,7 +1111,7 @@ RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper ) |* *************************************************************************/ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra, BOOL bFirst ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra, sal_Bool bFirst ) { sal_uInt32 nId = 0xFFFFFFFF; ERRTYPE aError; @@ -1152,7 +1152,7 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem |* *************************************************************************/ ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { ERRTYPE aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra ); @@ -1182,10 +1182,10 @@ RscFirstSysDepend::RscFirstSysDepend( Atom nId, sal_uInt32 nTypeId, |* *************************************************************************/ ERRTYPE RscFirstSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { ERRTYPE aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra ); - aError = WriteSysDependRc( rInst, rMem, pTC, nDeep, bExtra, TRUE ); + aError = WriteSysDependRc( rInst, rMem, pTC, nDeep, bExtra, sal_True ); return aError; } @@ -1242,7 +1242,7 @@ void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput, if( !IsDflt( rInst.pData, i ) && !IsValueDflt( rInst.pData, i ) ) { - aTmpI = GetInstData( rInst.pData, i, TRUE ); + aTmpI = GetInstData( rInst.pData, i, sal_True ); if( aTmpI.IsInst() ) aTmpI.pClass->WriteSrcHeader( diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx index b2632a73857c..632633d8d542 100644 --- a/rsc/source/res/rscclobj.cxx +++ b/rsc/source/res/rscclobj.cxx @@ -78,16 +78,16 @@ sal_uInt32 RefNode::GetId() const |* Letzte Aenderung MM 27.06.90 |* *************************************************************************/ -BOOL RefNode::PutObjNode( ObjNode * pPutObject ){ +sal_Bool RefNode::PutObjNode( ObjNode * pPutObject ){ // insert a node in the b-tree pObjBiTree // if the node with the same name is in pObjBiTree, -// return FALSE and no insert, +// return sal_False and no insert, if( pObjBiTree ) return( pObjBiTree->Insert( pPutObject ) ); pObjBiTree = pPutObject; - return( TRUE ); + return( sal_True ); } /****************** O b j N o d e ****************************************/ @@ -120,7 +120,7 @@ ObjNode * RefNode :: GetObjNode( const RscId & rRscId ){ |* Letzte Aenderung MM 15.05.91 |* *************************************************************************/ -ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, ULONG lKey ){ +ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey ){ pRscObj = pData; aRscId = rId; lFileKey = lKey; @@ -135,7 +135,7 @@ ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, ULONG lKey ){ |* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ -ObjNode * ObjNode::DelObjNode( RscTop * pClass, ULONG nFileKey ){ +ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey ){ ObjNode * pRetNode = this; if( Right() ) @@ -183,13 +183,13 @@ sal_uInt32 ObjNode::GetId() const |* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ -BOOL ObjNode::IsConsistent( RscInconsList * pList ) +sal_Bool ObjNode::IsConsistent( RscInconsList * pList ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if( (long)aRscId > 0x7FFF || (long)aRscId < 1 ) { - bRet = FALSE; + bRet = sal_False; if( pList ) pList->Insert( new RscInconsistent( aRscId, aRscId ) ); } @@ -198,10 +198,10 @@ BOOL ObjNode::IsConsistent( RscInconsList * pList ) if( Left() ) { if( !((ObjNode *)Left())->IsConsistent( pList ) ) - bRet = FALSE; + bRet = sal_False; if( ((ObjNode *)Left())->aRscId >= aRscId ) { - bRet = FALSE; + bRet = sal_False; if( pList ) pList->Insert( new RscInconsistent( ((ObjNode *)Left())->GetRscId(), @@ -212,14 +212,14 @@ BOOL ObjNode::IsConsistent( RscInconsList * pList ) { if( ((ObjNode *)Right())->aRscId <= aRscId ) { - bRet = FALSE; + bRet = sal_False; if( pList ) pList->Insert( new RscInconsistent( GetRscId(), ((ObjNode *)Right())->GetRscId() ) ); } if( !((ObjNode *)Right())->IsConsistent( pList ) ) - bRet = FALSE; + bRet = sal_False; }; }; diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx index 3961cbd539de..c089027a9a5b 100644 --- a/rsc/source/res/rscconst.cxx +++ b/rsc/source/res/rscconst.cxx @@ -99,7 +99,7 @@ RSCCLASS_TYPE RscConst::GetClassType() const |* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ -ERRTYPE RscConst::SetConstant( Atom nVarName, INT32 lValue ){ +ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue ){ if( pVarArray ) pVarArray = (VarEle *) rtl_reallocateMemory( (void *)pVarArray, @@ -138,7 +138,7 @@ Atom RscConst::GetConstant( sal_uInt32 nPos ){ |* Letzte Aenderung MM 15.05.91 |* *************************************************************************/ -BOOL RscConst::GetConstValue( Atom nConst, INT32 * pValue ) const +sal_Bool RscConst::GetConstValue( Atom nConst, sal_Int32 * pValue ) const { sal_uInt32 i = 0; @@ -146,9 +146,9 @@ BOOL RscConst::GetConstValue( Atom nConst, INT32 * pValue ) const if( pVarArray[ i ].nId == nConst ) { *pValue = pVarArray[ i ].lValue; - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } /************************************************************************* @@ -160,7 +160,7 @@ BOOL RscConst::GetConstValue( Atom nConst, INT32 * pValue ) const |* Letzte Aenderung MM 15.05.91 |* *************************************************************************/ -BOOL RscConst::GetValueConst( INT32 lValue, Atom * pConst ) const +sal_Bool RscConst::GetValueConst( sal_Int32 lValue, Atom * pConst ) const { sal_uInt32 i = 0; @@ -168,9 +168,9 @@ BOOL RscConst::GetValueConst( INT32 lValue, Atom * pConst ) const if( pVarArray[ i ].lValue == lValue ) { *pConst = pVarArray[ i ].nId; - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } /************************************************************************* @@ -260,14 +260,14 @@ RscEnum::RscEnum( Atom nId, sal_uInt32 nTypeId ) |* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ -ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, INT32 /*nVal*/ ) +ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ ) { sal_uInt32 i = 0; if( nEntries != (i = GetConstPos( nConst )) ) { ((RscEnumInst *)rInst.pData)->nValue = i; - ((RscEnumInst *)rInst.pData)->bDflt = FALSE; + ((RscEnumInst *)rInst.pData)->bDflt = sal_False; return( ERR_OK ); }; @@ -283,12 +283,12 @@ ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, INT32 /*nVal*/ ) |* Letzte Aenderung MM 18.07.91 |* *************************************************************************/ -ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, INT32 lValue ) +ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue ) { sal_uInt32 i = 0; for( i = 0; i < nEntries; i++ ){ - if( (INT32)pVarArray[ i ].lValue == lValue ) + if( (sal_Int32)pVarArray[ i ].lValue == lValue ) return( SetConst( rInst, pVarArray[ i ].nId, lValue ) ); }; @@ -318,7 +318,7 @@ ERRTYPE RscEnum::GetConst( const RSCINST & rInst, Atom * pH ){ |* Letzte Aenderung MM 16.09.91 |* *************************************************************************/ -ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, INT32 * pNumber ){ +ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, sal_Int32 * pNumber ){ *pNumber = pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue; return( ERR_OK ); } @@ -332,7 +332,7 @@ ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, INT32 * pNumber ){ |* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ -RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){ +RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){ RSCINST aInst; if( !pInst ){ @@ -349,7 +349,7 @@ RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass memmove( aInst.pData, rDflt.pData, Size() ); else{ ((RscEnumInst *)aInst.pData)->nValue = 0; - ((RscEnumInst *)aInst.pData)->bDflt = TRUE; + ((RscEnumInst *)aInst.pData)->bDflt = sal_True; } return( aInst ); @@ -364,16 +364,16 @@ RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass |* Letzte Aenderung MM 15.01.92 |* *************************************************************************/ -BOOL RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ +sal_Bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pDef ){ if( ((RscEnumInst*)rInst.pData)->nValue == ((RscEnumInst*)pDef)->nValue ) { - return TRUE; + return sal_True; } } - return FALSE; + return sal_False; } /************************************************************************* @@ -402,9 +402,9 @@ void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont *, sal_uInt32, BOOL ) + RscTypCont *, sal_uInt32, sal_Bool ) { - aMem.Put( (INT32)pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue ); + aMem.Put( (sal_Int32)pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue ); return( ERR_OK ); } diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx index 072c5feaa31d..fabfe6bf0b17 100644 --- a/rsc/source/res/rsccont.cxx +++ b/rsc/source/res/rsccont.cxx @@ -70,7 +70,7 @@ void ENTRY_STRUCT::Destroy() |* *************************************************************************/ RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, - BOOL bNoIdent ) + sal_Bool bNoIdent ) : RscTop( nId, nTypeId, pSuper ), nSize( 0 ) { @@ -141,7 +141,7 @@ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData ) |* *************************************************************************/ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, - BOOL bOwnClass ) + sal_Bool bOwnClass ) { sal_uInt32 i = 0; RSCINST aInst; @@ -161,7 +161,7 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, pClassData = (RscBaseContInst *)(aInst.pData + nOffInstData); pClassData->nEntries = 0; pClassData->pEntries = NULL; - pClassData->bDflt = TRUE; + pClassData->bDflt = sal_True; if( bOwnClass ){ RscBaseContInst * pDfltClassData; @@ -290,7 +290,7 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, else pCreateClass = pTypeClass; - pClassData->bDflt = FALSE; + pClassData->bDflt = sal_False; if( !bNoId ) aTmpI = SearchEle( rInst, rEleName, pCreateClass ); // Eintrag gefunden @@ -513,11 +513,11 @@ else |* Letzte Aenderung MM 12.06.91 |* *************************************************************************/ -ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, INT32 lValue ){ +ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ RscBaseContInst * pClassData; RSCINST aTmpI; ERRTYPE aError; - INT32 lNumber; + sal_Int32 lNumber; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -549,13 +549,13 @@ else ERRTYPE RscBaseCont::SetBool ( const RSCINST & rInst, - BOOL bValue + sal_Bool bValue ) { RscBaseContInst * pClassData; RSCINST aTmpI; ERRTYPE aError; - BOOL bBool; + sal_Bool bBool; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -589,7 +589,7 @@ ERRTYPE RscBaseCont::SetConst ( const RSCINST & rInst, Atom nValueId, - INT32 lValue + sal_Int32 lValue ) { RscBaseContInst * pClassData; @@ -673,10 +673,10 @@ else |* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ -BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){ +sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){ sal_uInt32 i = 0; RscBaseContInst * pClassData; - BOOL bRet; + sal_Bool bRet; bRet = RscTop::IsConsistent( rInst, pList ); @@ -686,9 +686,9 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){ // Komplexitaet = n^2 / 2 for( i = 0; i < pClassData->nEntries; i++ ){ if( !bNoId ){ - if( (INT32)pClassData->pEntries[ i ].aName > 0x7FFF - || (INT32)pClassData->pEntries[ i ].aName < 1 ){ - bRet = FALSE; + if( (sal_Int32)pClassData->pEntries[ i ].aName > 0x7FFF + || (sal_Int32)pClassData->pEntries[ i ].aName < 1 ){ + bRet = sal_False; if( pList ) pList->Insert( new RscInconsistent( pClassData->pEntries[ i ].aName, @@ -697,7 +697,7 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){ else if( SearchElePos( rInst, pClassData->pEntries[ i ].aName, pClassData->pEntries[ i ].aInst.pClass, i +1 ).IsInst() ) { - bRet = FALSE; + bRet = sal_False; if( pList ) pList->Insert( new RscInconsistent( pClassData->pEntries[ i ].aName, @@ -706,7 +706,7 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){ } if( ! pClassData->pEntries[ i ].aInst.pClass-> IsConsistent( pClassData->pEntries[ i ].aInst, pList ) ) - bRet = FALSE; + bRet = sal_False; }; return( bRet ); @@ -746,20 +746,20 @@ void RscBaseCont::SetToDefault( const RSCINST & rInst ) |* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ -BOOL RscBaseCont::IsDefault( const RSCINST & rInst ){ +sal_Bool RscBaseCont::IsDefault( const RSCINST & rInst ){ sal_uInt32 i = 0; RscBaseContInst * pClassData; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); if( !pClassData->bDflt ) - return FALSE; + return sal_False; for( i = 0; i < pClassData->nEntries; i++ ){ if( ! pClassData->pEntries[ i ].aInst.pClass-> IsDefault( pClassData->pEntries[ i ].aInst ) ) { - return( FALSE ); + return( sal_False ); }; }; @@ -775,19 +775,19 @@ BOOL RscBaseCont::IsDefault( const RSCINST & rInst ){ |* Letzte Aenderung MM 15.01.92 |* *************************************************************************/ -BOOL RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) +sal_Bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { RscBaseContInst * pClassData; if( !RscTop::IsValueDefault( rInst, pDef ) ) - return FALSE; + return sal_False; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); if( pClassData->nEntries ) - return FALSE; + return sal_False; else - return TRUE; + return sal_True; } /************************************************************************* @@ -886,14 +886,14 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { sal_uInt32 i = 0; RscBaseContInst * pClassData; ERRTYPE aError; if( bExtra || bNoId ) - { // Nur Subresourcen schreiben, wenn bExtra == TRUE + { // Nur Subresourcen schreiben, wenn bExtra == sal_True pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); for( i = 0; i < pClassData->nEntries && aError.IsOk(); i++ ){ @@ -914,7 +914,7 @@ void RscBaseCont::ContWriteRcAccess FILE * fOutput, RscTypCont * pTC, const char * pName, - BOOL bWriteSize + sal_Bool bWriteSize ) { if( (bNoId || bWriteSize) && !pTypeClass1 ) @@ -965,7 +965,7 @@ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { ERRTYPE aError; @@ -1057,7 +1057,7 @@ ERRTYPE RscBaseCont::WriteCxx( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId, - RscTop * pSuper, BOOL bNoIdent ) + RscTop * pSuper, sal_Bool bNoIdent ) : RscBaseCont( nId, nTypeId, pSuper, bNoIdent ) {} @@ -1100,7 +1100,7 @@ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* Letzte Aenderung MM 08.05.91 |* *************************************************************************/ -RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, BOOL bNoIdent ) +RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent ) : RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent ) {} @@ -1114,7 +1114,7 @@ RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, BOOL bNoIdent ) |* *************************************************************************/ ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { RscBaseContInst * pClassData; ERRTYPE aError; @@ -1139,7 +1139,7 @@ void RscCont::WriteRcAccess const char * pName ) { - ContWriteRcAccess( fOutput, pTC, pName, TRUE ); + ContWriteRcAccess( fOutput, pTC, pName, sal_True ); } /************************************************************************* @@ -1152,7 +1152,7 @@ void RscCont::WriteRcAccess |* *************************************************************************/ RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId, - RscTop * pSuper, BOOL bNoIdent ) + RscTop * pSuper, sal_Bool bNoIdent ) : RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent ) {} @@ -1166,7 +1166,7 @@ RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId, |* *************************************************************************/ ERRTYPE RscContExtraData::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { ERRTYPE aError; 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; diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index 3e3d29372fe7..69a989c1683b 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.cxx @@ -78,7 +78,7 @@ sal_uInt32 RscMgr::Size() |* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ -RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){ +RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){ RSCINST aInst; RscMgrInst * pClassData; @@ -136,7 +136,7 @@ void RscMgr::SetToDefault( const RSCINST & rInst ) RscMgrInst * pClassData; pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); - pClassData->bDflt = TRUE; + pClassData->bDflt = sal_True; RscClass::SetToDefault( rInst ); } @@ -150,12 +150,12 @@ void RscMgr::SetToDefault( const RSCINST & rInst ) |* Letzte Aenderung MM 12.06.91 |* *************************************************************************/ -BOOL RscMgr::IsDefault( const RSCINST & rInst ){ +sal_Bool RscMgr::IsDefault( const RSCINST & rInst ){ RscMgrInst * pClassData; pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); if( !pClassData->bDflt ) - return( FALSE ); + return( sal_False ); return( RscClass::IsDefault( rInst ) ); } @@ -169,23 +169,23 @@ BOOL RscMgr::IsDefault( const RSCINST & rInst ){ |* Letzte Aenderung MM 12.06.91 |* *************************************************************************/ -BOOL RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ +sal_Bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ RscMgrInst * pClassData; RscMgrInst * pDfltData; if( !RscClass::IsValueDefault( rInst, pDef ) ) - return FALSE; + return sal_False; if( pDef ){ pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); pDfltData = (RscMgrInst *)(pDef + RscClass::Size()); if( !pClassData->aRefId.IsId() && !pDfltData->aRefId.IsId() ){ - return TRUE; + return sal_True; } } - return FALSE; + return sal_False; } @@ -254,7 +254,7 @@ void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32, *************************************************************************/ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, const RscId &rId, - sal_uInt32 nDeep, BOOL bExtra ) + sal_uInt32 nDeep, sal_Bool bExtra ) { RscMgrInst * pClassData; ERRTYPE aError; @@ -350,7 +350,7 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, |* *************************************************************************/ ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &, - RscTypCont *, sal_uInt32, BOOL ) + RscTypCont *, sal_uInt32, sal_Bool ) { return( ERR_OK ); @@ -593,9 +593,9 @@ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput, |* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ -BOOL RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) +sal_Bool RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) { - BOOL bRet; + sal_Bool bRet; RscMgrInst * pClassData; bRet = RscClass::IsConsistent( rInst, pList ); @@ -610,7 +610,7 @@ BOOL RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) pList->Insert( new RscInconsistent( pClassData->aRefId, pClassData->aRefId ) ); - bRet = FALSE; + bRet = sal_False; } return( bRet ); @@ -664,7 +664,7 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) aTmpI.pData = pObjNode->GetRscObj(); nDeep++; } - else //aTmpI.IsInst() wird FALSE, Schleife beenden + else //aTmpI.IsInst() wird sal_False, Schleife beenden aTmpI.pData = NULL; } @@ -708,7 +708,7 @@ ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId ) aError = IsToDeep( rInst ); if( aError.IsOk() ) - pClassData->bDflt = FALSE; + pClassData->bDflt = sal_False; else pClassData->aRefId = aOldId; } diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx index 5ade3936bdf8..78fa86b6fa48 100644 --- a/rsc/source/res/rscrange.cxx +++ b/rsc/source/res/rscrange.cxx @@ -82,7 +82,7 @@ RSCCLASS_TYPE RscRange::GetClassType() const |* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ -ERRTYPE RscRange::SetRange( INT32 nMinimum, INT32 nMaximum ) +ERRTYPE RscRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) { if( nMinimum > nMaximum ) { @@ -107,18 +107,18 @@ ERRTYPE RscRange::SetRange( INT32 nMinimum, INT32 nMaximum ) |* Letzte Aenderung MM 15.02.92 |* *************************************************************************/ -BOOL RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) +sal_Bool RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { if( pDef ) { if( ((RscRangeInst*)rInst.pData)->nValue == ((RscRangeInst*)pDef)->nValue ) { - return TRUE; + return sal_True; } } - return FALSE; + return sal_False; } /************************************************************************* @@ -130,12 +130,12 @@ BOOL RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) |* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ -ERRTYPE RscRange::SetNumber( const RSCINST & rInst, INT32 nValue ) +ERRTYPE RscRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { if( nMax < nValue || nMin > nValue ) return( ERR_RSCRANGE_OUTDEFSET ); ((RscRangeInst *)rInst.pData)->nValue = (sal_uInt16)( nValue - nMin ); - ((RscRangeInst *)rInst.pData)->bDflt = FALSE; + ((RscRangeInst *)rInst.pData)->bDflt = sal_False; return( ERR_OK ); } @@ -148,7 +148,7 @@ ERRTYPE RscRange::SetNumber( const RSCINST & rInst, INT32 nValue ) |* Letzte Aenderung MM 22.04.91 |* *************************************************************************/ -ERRTYPE RscRange::GetNumber( const RSCINST & rInst, INT32 * pN ) +ERRTYPE RscRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) { *pN = ((RscRangeInst *)rInst.pData)->nValue + nMin; return( ERR_OK ); @@ -164,7 +164,7 @@ ERRTYPE RscRange::GetNumber( const RSCINST & rInst, INT32 * pN ) |* *************************************************************************/ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt, - BOOL bOwnClass ) + sal_Bool bOwnClass ) { RSCINST aInst; @@ -187,7 +187,7 @@ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt, ((RscRangeInst *)aInst.pData)->nValue = (sal_uInt16)(0L - nMin); else ((RscRangeInst *)aInst.pData)->nValue = 0; - ((RscRangeInst *)aInst.pData)->bDflt = TRUE; + ((RscRangeInst *)aInst.pData)->bDflt = sal_True; } return( aInst ); @@ -218,7 +218,7 @@ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont *, sal_uInt32, BOOL ) + RscTypCont *, sal_uInt32, sal_Bool ) { if( nMin >= 0 ) { @@ -292,7 +292,7 @@ RSCCLASS_TYPE RscLongRange::GetClassType() const |* Letzte Aenderung MM 18.07.94 |* *************************************************************************/ -ERRTYPE RscLongRange::SetRange( INT32 nMinimum, INT32 nMaximum ) +ERRTYPE RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) { if( nMinimum > nMaximum ) { @@ -317,14 +317,14 @@ ERRTYPE RscLongRange::SetRange( INT32 nMinimum, INT32 nMaximum ) |* Letzte Aenderung MM 15.02.92 |* *************************************************************************/ -BOOL RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) +sal_Bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { if( pDef ) return 0 == memcmp( &((RscLongRangeInst*)rInst.pData)->nValue, &((RscLongRangeInst*)pDef)->nValue, - sizeof( INT32 ) ); + sizeof( sal_Int32 ) ); - return FALSE; + return sal_False; } /************************************************************************* @@ -336,13 +336,13 @@ BOOL RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) |* Letzte Aenderung MM 18.07.94 |* *************************************************************************/ -ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, INT32 nValue ) +ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { if( nMax < nValue || nMin > nValue ) return( ERR_RSCRANGE_OUTDEFSET ); void * pData = &((RscLongRangeInst*)rInst.pData)->nValue; - memmove( pData, &nValue, sizeof( INT32 ) ); - ((RscLongRangeInst *)rInst.pData)->bDflt = FALSE; + memmove( pData, &nValue, sizeof( sal_Int32 ) ); + ((RscLongRangeInst *)rInst.pData)->bDflt = sal_False; return( ERR_OK ); } @@ -355,10 +355,10 @@ ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, INT32 nValue ) |* Letzte Aenderung MM 22.04.91 |* *************************************************************************/ -ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, INT32 * pN ) +ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) { memmove( pN, &((RscLongRangeInst*)rInst.pData)->nValue, - sizeof( INT32 ) ); + sizeof( sal_Int32 ) ); return( ERR_OK ); } @@ -372,7 +372,7 @@ ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, INT32 * pN ) |* *************************************************************************/ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, - BOOL bOwnClass ) + sal_Bool bOwnClass ) { RSCINST aInst; @@ -391,14 +391,14 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, memmove( aInst.pData, rDflt.pData, sizeof( RscLongRangeInst ) ); else { - INT32 lDflt; + sal_Int32 lDflt; if( 0L >= nMin && 0L <= nMax ) lDflt = 0; else lDflt = nMin; void * pData = &((RscLongRangeInst*)aInst.pData)->nValue; - memmove( pData, &lDflt, sizeof( INT32 ) ); - ((RscLongRangeInst *)aInst.pData)->bDflt = TRUE; + memmove( pData, &lDflt, sizeof( sal_Int32 ) ); + ((RscLongRangeInst *)aInst.pData)->bDflt = sal_True; } return( aInst ); @@ -416,7 +416,7 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { - INT32 lVal; + sal_Int32 lVal; GetNumber( rInst, &lVal ); fprintf( fOutput, "%d", static_cast<int>(lVal) ); } @@ -431,12 +431,12 @@ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont *, sal_uInt32, BOOL ) + RscTypCont *, sal_uInt32, sal_Bool ) { - INT32 lVal; + sal_Int32 lVal; GetNumber( rInst, &lVal ); - aMem.Put( (INT32)lVal ); + aMem.Put( (sal_Int32)lVal ); return( ERR_OK ); } @@ -451,7 +451,7 @@ void RscLongRange::WriteRcAccess { fprintf( fOutput, "\t\tSet%s( ", pName ); fprintf( fOutput, "GetLong( pResData+nOffset ) );\n" ); - fprintf( fOutput, "\t\tnOffset += sizeof( INT32 );\n" ); + fprintf( fOutput, "\t\tnOffset += sizeof( sal_Int32 );\n" ); } /****************** R s c L o n g E n u m R a n g e *********************/ @@ -471,7 +471,7 @@ RscLongEnumRange::RscLongEnumRange( Atom nId, sal_uInt32 nTypeId ) |* Beschreibung *************************************************************************/ ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/, - INT32 nValue ) + sal_Int32 nValue ) { return SetNumber( rInst, nValue ); } @@ -516,7 +516,7 @@ RSCCLASS_TYPE RscIdRange::GetClassType() const |* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ -RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){ +RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){ RSCINST aInst; RscId * pClassData; @@ -539,11 +539,11 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnCla else{ *pClassData = RscId(); if( 0 >= nMin && 0 <= nMax ) - *pClassData = RscId( (INT32)0 ); + *pClassData = RscId( (sal_Int32)0 ); else *pClassData = RscId( nMin ); //cUnused wird fuer Defaultkennung verwendet - ((RscId *)aInst.pData)->aExp.cUnused = TRUE; + ((RscId *)aInst.pData)->aExp.cUnused = sal_True; } return( aInst ); @@ -571,7 +571,7 @@ void RscIdRange :: Destroy( const RSCINST & rInst ){ |* Letzte Aenderung MM 15.01.92 |* *************************************************************************/ -BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ +sal_Bool RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pDef ){ if( ((RscId*)rInst.pData)->aExp.IsNumber() && ((RscId*)pDef)->aExp.IsNumber() ) @@ -579,12 +579,12 @@ BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( ((RscId*)rInst.pData)->GetNumber() == ((RscId*)pDef)->GetNumber() ) { - return TRUE; + return sal_True; } } } - return FALSE; + return sal_False; } /************************************************************************* @@ -596,13 +596,13 @@ BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ |* Letzte Aenderung MM 25.11.91 |* *************************************************************************/ -ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, INT32 nValue ) +ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { if( nMax < nValue || nMin > nValue ) return( ERR_RSCRANGE_OUTDEFSET ); *(RscId *)rInst.pData = RscId( nValue ); - ((RscId *)rInst.pData)->aExp.cUnused = FALSE; + ((RscId *)rInst.pData)->aExp.cUnused = sal_False; return( ERR_OK ); } @@ -615,7 +615,7 @@ ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, INT32 nValue ) |* Letzte Aenderung MM 25.11.91 |* *************************************************************************/ -ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, INT32 * plValue ){ +ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, sal_Int32 * plValue ){ *plValue = ((RscId *)rInst.pData)->GetNumber(); return( ERR_OK ); } @@ -635,7 +635,7 @@ ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){ aError = SetNumber( rInst, rRscId ); if( aError.IsOk() ){ *(RscId *)rInst.pData = rRscId; - ((RscId *)rInst.pData)->aExp.cUnused = FALSE; + ((RscId *)rInst.pData)->aExp.cUnused = sal_False; } } else @@ -684,11 +684,11 @@ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ ERRTYPE RscIdRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont *, sal_uInt32, BOOL ) + RscTypCont *, sal_uInt32, sal_Bool ) { - INT32 lVal = ((RscId*)rInst.pData)->GetNumber(); + sal_Int32 lVal = ((RscId*)rInst.pData)->GetNumber(); - aMem.Put( (INT32)lVal ); + aMem.Put( (sal_Int32)lVal ); return( ERR_OK ); } @@ -703,7 +703,7 @@ void RscIdRange::WriteRcAccess { fprintf( fOutput, "\t\tSet%s( ", pName ); fprintf( fOutput, "GetLong( pResData+nOffset ) );\n" ); - fprintf( fOutput, "\t\tnOffset += sizeof( INT32 );\n" ); + fprintf( fOutput, "\t\tnOffset += sizeof( sal_Int32 );\n" ); } /************************************************************************* @@ -715,16 +715,16 @@ void RscIdRange::WriteRcAccess |* Letzte Aenderung MM 22.11.91 |* *************************************************************************/ -BOOL RscIdRange::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) +sal_Bool RscIdRange::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) { long nValue = ((RscId *)rInst.pData)->GetNumber(); if( (nMax >= nValue) && (nMin <= nValue) ) - return TRUE; + return sal_True; else { if( pList ) pList->Insert( new RscInconsistent( *(RscId *)rInst.pData, *(RscId *)rInst.pData ) ); - return FALSE; + return sal_False; } } @@ -770,7 +770,7 @@ RSCCLASS_TYPE RscBool::GetClassType() const void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { - INT32 l; + sal_Int32 l; GetNumber( rInst, &l ); if( l ) @@ -788,7 +788,7 @@ void RscBool::WriteRcAccess ) { fprintf( fOutput, "\t\tSet%s( ", pName ); - fprintf( fOutput, "(BOOL)*(short *)(pResData+nOffset) );\n" ); + fprintf( fOutput, "(sal_Bool)*(short *)(pResData+nOffset) );\n" ); fprintf( fOutput, "\t\tnOffset += sizeof( short );\n" ); } @@ -817,7 +817,7 @@ RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId ) |* Letzte Aenderung MM 24.06.91 |* *************************************************************************/ -ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, INT32 nValue ){ +ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ){ if( nValue == nOutRange ) return( ERR_RSCRANGE_OUTDEFSET ); else @@ -834,10 +834,10 @@ ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, INT32 nValue ){ |* *************************************************************************/ RSCINST RscBreakRange::Create( RSCINST * pInst, const RSCINST & rDflt, - BOOL bOwnClass ) + sal_Bool bOwnClass ) { RSCINST aInst; - INT32 l; + sal_Int32 l; aInst = RscRange::Create( pInst, rDflt, bOwnClass ); diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index 6bf25cf4dd58..ad668ac2b3cb 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.cxx @@ -87,7 +87,7 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){ ERRTYPE aError; if( aError.IsOk() ){ - ((RscStringInst *)rInst.pData)->bDflt = FALSE; + ((RscStringInst *)rInst.pData)->bDflt = sal_False; pTmp = ((RscStringInst *)rInst.pData)->pStr; if( pTmp ){ @@ -147,7 +147,7 @@ ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){ if( pRefClass ){ ((RscStringInst *)rInst.pData)->aRefId = rRefId; - ((RscStringInst *)rInst.pData)->bDflt = FALSE; + ((RscStringInst *)rInst.pData)->bDflt = sal_False; } else return( ERR_REFNOTALLOWED ); @@ -165,7 +165,7 @@ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){ |* *************************************************************************/ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, - BOOL bOwnClass ) + sal_Bool bOwnClass ) { RSCINST aInst; @@ -181,7 +181,7 @@ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, ((RscStringInst *)aInst.pData)->aRefId.Create(); ((RscStringInst *)aInst.pData)->pStr = NULL; - ((RscStringInst *)aInst.pData)->bDflt = TRUE; + ((RscStringInst *)aInst.pData)->bDflt = sal_True; if( bOwnClass ){ ((RscStringInst *)aInst.pData)->aRefId = @@ -218,7 +218,7 @@ void RscString::Destroy( const RSCINST & rInst ){ |* Letzte Aenderung MM 15.01.92 |* *************************************************************************/ -BOOL RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ +sal_Bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ RscStringInst * pData = (RscStringInst*)rInst.pData; RscStringInst * pDefData = (RscStringInst*)pDef; @@ -231,34 +231,34 @@ BOOL RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ // Sind die Referenzidentifier gleich if( pData->aRefId.GetNumber() == pDefData->aRefId.GetNumber() ) { - return TRUE; + return sal_True; } } } else { - BOOL bStrEmpty = FALSE; - BOOL bDefStrEmpty = FALSE; + sal_Bool bStrEmpty = sal_False; + sal_Bool bDefStrEmpty = sal_False; if( pData->pStr ){ bStrEmpty = ('\0' == *pData->pStr); } else - bStrEmpty = TRUE; + bStrEmpty = sal_True; if( pDefData->pStr ){ bDefStrEmpty = ('\0' == *pDefData->pStr); } else - bDefStrEmpty = TRUE; + bDefStrEmpty = sal_True; if( !bStrEmpty || !bDefStrEmpty ){ - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } } - return FALSE; + return sal_False; } /************************************************************************* @@ -319,7 +319,7 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* *************************************************************************/ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { ERRTYPE aError; ObjNode * pObjNode = NULL; diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index 4b7887ebf298..cff9c92ab508 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.cxx @@ -180,12 +180,12 @@ ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){ |* Letzte Aenderung MM 17.05.91 |* *************************************************************************/ -BOOL RscTop::InHierarchy( RscTop * pClass ){ +sal_Bool RscTop::InHierarchy( RscTop * pClass ){ if( this == pClass ) - return( TRUE ); + return( sal_True ); if( pSuperClass ) return( pSuperClass->InHierarchy( pClass ) ); - return( FALSE ); + return( sal_False ); } /************************************************************************* @@ -238,7 +238,7 @@ RSCINST RscTop::GetVariable const RSCINST & rInst, Atom nVarName, const RSCINST & rInitInst, - BOOL bInitDflt, + sal_Bool bInitDflt, RscTop * pCreateClass ) { @@ -342,7 +342,7 @@ ERRTYPE RscTop::GetArrayEle ERRTYPE RscTop::GetValueEle ( const RSCINST & rInst, - INT32 lValue, + sal_Int32 lValue, RscTop * pCreateClass, RSCINST * pGetInst ) @@ -469,7 +469,7 @@ sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){ |* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -ERRTYPE RscTop::SetNumber( const RSCINST & rInst, INT32 lValue ){ +ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ if( pSuperClass ) return pSuperClass-> SetNumber( rInst, lValue ); @@ -486,7 +486,7 @@ ERRTYPE RscTop::SetNumber( const RSCINST & rInst, INT32 lValue ){ |* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -ERRTYPE RscTop::SetBool( const RSCINST & rInst, BOOL bValue ){ +ERRTYPE RscTop::SetBool( const RSCINST & rInst, sal_Bool bValue ){ if( pSuperClass ) return pSuperClass-> SetBool( rInst, bValue ); @@ -503,7 +503,7 @@ ERRTYPE RscTop::SetBool( const RSCINST & rInst, BOOL bValue ){ |* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, INT32 nVal ) +ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, sal_Int32 nVal ) { if( pSuperClass ) return pSuperClass->SetConst( rInst, nId, nVal ); @@ -554,7 +554,7 @@ ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){ |* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -ERRTYPE RscTop::GetNumber( const RSCINST & rInst, INT32 * pN ){ +ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN ){ if( pSuperClass ) return pSuperClass-> GetNumber( rInst, pN ); @@ -571,7 +571,7 @@ ERRTYPE RscTop::GetNumber( const RSCINST & rInst, INT32 * pN ){ |* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -ERRTYPE RscTop::GetBool( const RSCINST & rInst, BOOL * pB ){ +ERRTYPE RscTop::GetBool( const RSCINST & rInst, sal_Bool * pB ){ if( pSuperClass ) return pSuperClass-> GetBool( rInst, pB ); @@ -622,7 +622,7 @@ ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){ |* Letzte Aenderung MM 17.07.91 |* *************************************************************************/ -RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, BOOL bOwnRange ) +RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, sal_Bool bOwnRange ) { if( pSuperClass ) return pSuperClass-> @@ -657,13 +657,13 @@ void RscTop::Destroy( const RSCINST & rInst ){ |* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -BOOL RscTop::IsConsistent( const RSCINST & rInst, +sal_Bool RscTop::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) { if( pSuperClass ) return pSuperClass->IsConsistent( rInst, pList ); else - return TRUE; + return sal_True; } /************************************************************************* @@ -690,11 +690,11 @@ void RscTop::SetToDefault( const RSCINST & rInst ) |* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -BOOL RscTop::IsDefault( const RSCINST & rInst ){ +sal_Bool RscTop::IsDefault( const RSCINST & rInst ){ if( pSuperClass ) return pSuperClass->IsDefault( rInst ); else - return TRUE; + return sal_True; } /************************************************************************* @@ -706,11 +706,11 @@ BOOL RscTop::IsDefault( const RSCINST & rInst ){ |* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -BOOL RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ +sal_Bool RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pSuperClass ) return pSuperClass->IsValueDefault( rInst, pDef ); else - return TRUE; + return sal_True; } /************************************************************************* @@ -907,7 +907,7 @@ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput, *************************************************************************/ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, const RscId & rId, - sal_uInt32 nDeep, BOOL bExtra ) + sal_uInt32 nDeep, sal_Bool bExtra ) { if( pSuperClass ) return( pSuperClass-> @@ -926,7 +926,7 @@ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, |* *************************************************************************/ ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) + RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { if( pSuperClass ) return( pSuperClass-> diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 54073563403d..8e9379738fed 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -141,7 +141,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) RscPtrPtr aCmdLine; // Kommandozeile ByteString aString; sal_uInt32 i; - BOOL bOutputSrsIsSet = FALSE; + sal_Bool bOutputSrsIsSet = sal_False; Init(); // Defaults setzen @@ -253,7 +253,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) ) { // anderer Name fuer .srs-file aOutputSrs = (*ppStr) + 4; - bOutputSrsIsSet = TRUE; + bOutputSrsIsSet = sal_True; } else if( !rsc_strnicmp( (*ppStr) + 1, "fl=", 3 ) ) { // Name fuer listing-file @@ -348,9 +348,9 @@ RscCmdLine::~RscCmdLine() { ByteString *pString; - while( NULL != (pString = aInputList.Remove( (ULONG)0 )) ) + while( NULL != (pString = aInputList.Remove( (sal_uLong)0 )) ) delete pString; - while( NULL != (pString = aSymbolList.Remove( (ULONG)0 )) ) + while( NULL != (pString = aSymbolList.Remove( (sal_uLong)0 )) ) delete pString; } @@ -576,7 +576,7 @@ void RscCompiler::EndCompile() if( !pFN->IsIncFile() ) { pTC->WriteSrc( foutput, NOFILE_INDEX, - RTL_TEXTENCODING_UNICODE, FALSE ); + RTL_TEXTENCODING_UNICODE, sal_False ); break; // ?T 281091MM nur eine Src-Datei } }; @@ -656,7 +656,7 @@ void RscCompiler::EndCompile() |* Letzte Aenderung MM 21.06.91 |* *************************************************************************/ -ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey ) +ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey ) { FILE * finput; RscFile * pFName; @@ -681,7 +681,7 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey ) RscDepend * pDep; RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput ); - pFName->bScanned = TRUE; + pFName->bScanned = sal_True; ::IncludeParser( &aFileInst ); fclose( finput ); @@ -724,7 +724,7 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey ) |* Letzte Aenderung MM 26.06.91 |* *************************************************************************/ -ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, +ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext ) { @@ -740,7 +740,7 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, RscDepend * pDep; //Include-Dateien vorher lesen - pFName->bLoaded = TRUE; //Endlos Rekursion vermeiden + pFName->bLoaded = sal_True; //Endlos Rekursion vermeiden pDep = pFName->First(); while( pDep && aError.IsOk() ) { @@ -750,7 +750,7 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, } if( aError.IsError() ) - pFName->bLoaded = FALSE; //bei Fehler nicht geladenen + pFName->bLoaded = sal_False; //bei Fehler nicht geladenen else { String aTmpName( ::GetTmpFileName(), RTL_TEXTENCODING_ASCII_US ); @@ -855,7 +855,7 @@ ERRTYPE RscCompiler::Link() { pTC->Delete( pTC->aFileTab.GetIndex( pFName ) ); pTC->aFileTab.Seek( pFName ); - pFName->bLoaded = FALSE; + pFName->bLoaded = sal_False; } } @@ -1115,7 +1115,7 @@ ByteString RscCompiler::GetTmpFileName() /********************************************************************/ /* */ -/* Function : BOOL openinput() */ +/* Function : sal_Bool openinput() */ /* */ /* Description : Check to see if the input file exists and can */ /* be opened for reading. */ diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx index 2e43844b9f08..f554040c4ec9 100644 --- a/rsc/source/tools/rscchar.cxx +++ b/rsc/source/tools/rscchar.cxx @@ -53,7 +53,7 @@ |* Letzte Aenderung MM 20.03.91 |* *************************************************************************/ -char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding ) +char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) { sal_Size nMaxUniCodeBuf = strlen( pStr ) + 1; if( nMaxUniCodeBuf * 6 > 0x0FFFFF ) @@ -113,7 +113,7 @@ char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding ) int i = 0; while( '0' <= *pStr && '7' >= *pStr && i != 3 ) { - nChar = nChar * 8 + (BYTE)*pStr - (BYTE)'0'; + nChar = nChar * 8 + (sal_uInt8)*pStr - (sal_uInt8)'0'; ++pStr; i++; } @@ -134,11 +134,11 @@ char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding ) while( isxdigit( *pStr ) && i != 2 ) { if( isdigit( *pStr ) ) - nChar = nChar * 16 + (BYTE)*pStr - (BYTE)'0'; + nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'0'; else if( isupper( *pStr ) ) - nChar = nChar * 16 + (BYTE)*pStr - (BYTE)'A' +10; + nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'A' +10; else - nChar = nChar * 16 + (BYTE)*pStr - (BYTE)'a' +10; + nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'a' +10; ++pStr; i++; } diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index eb714bbcc3c2..6231bbd92aae 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -34,7 +34,7 @@ /****************** C o d e **********************************************/ /****************** R s c I d ********************************************/ -BOOL RscId::bNames = TRUE; +sal_Bool RscId::bNames = sal_True; /************************************************************************* |* @@ -46,8 +46,8 @@ BOOL RscId::bNames = TRUE; |* Letzte Aenderung MM 26.06.91 |* *************************************************************************/ -void RscId::SetNames( BOOL bSet ) { bNames = bSet; } -BOOL RscId::IsSetNames() { return bNames; } +void RscId::SetNames( sal_Bool bSet ) { bNames = bSet; } +sal_Bool RscId::IsSetNames() { return bNames; } /************************************************************************* |* @@ -58,8 +58,8 @@ BOOL RscId::IsSetNames() { return bNames; } |* Letzte Aenderung MM 17.05.91 |* *************************************************************************/ -INT32 RscId::GetNumber() const{ - INT32 lVal; +sal_Int32 RscId::GetNumber() const{ + sal_Int32 lVal; aExp.Evaluate( &lVal ); return lVal; } @@ -79,7 +79,7 @@ void RscId::Create( const RscExpType & rExpType ) if( aExp.IsDefinition() ) aExp.aExp.pDef->IncRef(); else if( aExp.IsExpression() ){ - INT32 lValue; + sal_Int32 lValue; aExp.Evaluate( &lValue ); aExp.SetLong( lValue ); @@ -159,7 +159,7 @@ RscId& RscId::operator = ( const RscId& rRscId ){ |* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ -BOOL RscId::operator == ( const RscId& rRscId ) const +sal_Bool RscId::operator == ( const RscId& rRscId ) const { return( GetNumber() == rRscId.GetNumber() ); } @@ -173,7 +173,7 @@ BOOL RscId::operator == ( const RscId& rRscId ) const |* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ -BOOL RscId::operator < ( const RscId& rRscId ) const +sal_Bool RscId::operator < ( const RscId& rRscId ) const { return( GetNumber() < rRscId.GetNumber() ); } @@ -187,21 +187,21 @@ BOOL RscId::operator < ( const RscId& rRscId ) const |* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ -BOOL RscId::operator > ( const RscId& rRscId ) const +sal_Bool RscId::operator > ( const RscId& rRscId ) const { return( GetNumber() > rRscId.GetNumber() ); } /************************************************************************* |* -|* RscId::INT32() +|* RscId::sal_Int32() |* |* Beschreibung |* Ersterstellung MM 16.05.91 |* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ -RscId::operator INT32() const +RscId::operator sal_Int32() const { return( GetNumber() ); } @@ -261,7 +261,7 @@ ByteString RscId::GetMacro() const |* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ -RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, INT32 lDefId ) +RscDefine::RscDefine( sal_uLong lKey, const ByteString & rDefName, sal_Int32 lDefId ) : StringNode( rDefName ) { nRefCount = 0; @@ -270,7 +270,7 @@ RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, INT32 lDefId ) pExp = NULL; } -RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, +RscDefine::RscDefine( sal_uLong lKey, const ByteString & rDefName, RscExpression * pExpression ) : StringNode( rDefName ) { @@ -345,7 +345,7 @@ void RscDefine::ChangeMacro( RscExpression * pExpression ){ pExp->Evaluate( &lId ); } -void RscDefine::ChangeMacro( INT32 lIdentifier ){ +void RscDefine::ChangeMacro( sal_Int32 lIdentifier ){ if( pExp ){ delete pExp; pExp = NULL; @@ -362,8 +362,8 @@ void RscDefine::ChangeMacro( INT32 lIdentifier ){ |* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ -BOOL RscDefine::Evaluate(){ - BOOL bRet = TRUE; +sal_Bool RscDefine::Evaluate(){ + sal_Bool bRet = sal_True; if( pExp ) bRet = !pExp->Evaluate( &lId ); @@ -410,8 +410,8 @@ ByteString RscDefine::GetMacro() |* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ -RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName, - INT32 lDefId, ULONG lPos ) +RscDefine * RscDefineList::New( sal_uLong lFileKey, const ByteString & rDefName, + sal_Int32 lDefId, sal_uLong lPos ) { RscDefine * pDef; @@ -421,8 +421,8 @@ RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName, return pDef; } -RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName, - RscExpression * pExpression, ULONG lPos ) +RscDefine * RscDefineList::New( sal_uLong lFileKey, const ByteString & rDefName, + RscExpression * pExpression, sal_uLong lPos ) { RscDefine * pDef; @@ -442,7 +442,7 @@ RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName, |* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ -BOOL RscDefineList::Remove( RscDefine * pDef ){ +sal_Bool RscDefineList::Remove( RscDefine * pDef ){ pDef = RscSubDefList::Remove( pDef ); if( pDef ){ pDef->DefineToNumber(); @@ -452,7 +452,7 @@ BOOL RscDefineList::Remove( RscDefine * pDef ){ return( NULL != pDef ); } -BOOL RscDefineList::Remove( ULONG lIndex ){ +sal_Bool RscDefineList::Remove( sal_uLong lIndex ){ RscDefine * pDef = RscSubDefList::Remove( lIndex ); if( pDef ){ pDef->DefineToNumber(); @@ -462,10 +462,10 @@ BOOL RscDefineList::Remove( ULONG lIndex ){ return( NULL != pDef ); } -BOOL RscDefineList::Remove(){ +sal_Bool RscDefineList::Remove(){ RscDefine * pDef; - pDef = RscSubDefList::Remove( (ULONG)0 ); + pDef = RscSubDefList::Remove( (sal_uLong)0 ); if( pDef ){ pDef->DefineToNumber(); @@ -483,7 +483,7 @@ BOOL RscDefineList::Remove(){ |* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ -BOOL RscDefineList::Befor( const RscDefine * pFree, +sal_Bool RscDefineList::Befor( const RscDefine * pFree, const RscDefine * pDepend ) { RscDefine * pDef; @@ -494,13 +494,13 @@ BOOL RscDefineList::Befor( const RscDefine * pFree, pDef = Next(); while( pDef ){ if( pDef == pDepend ) - return TRUE; + return sal_True; pDef = Next(); } } pDef = Next(); }; - return FALSE; + return sal_False; } /************************************************************************* @@ -535,7 +535,7 @@ void RscDefineList::WriteAll( FILE * fOutput ) |* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ -BOOL RscExpType::Evaluate( INT32 * plValue ) const{ +sal_Bool RscExpType::Evaluate( sal_Int32 * plValue ) const{ if( IsDefinition() ){ aExp.pDef->Evaluate(); // Eventuellen Fehler ignorieren @@ -548,7 +548,7 @@ BOOL RscExpType::Evaluate( INT32 * plValue ) const{ else *plValue = GetLong(); - return TRUE; + return sal_True; } /************************************************************************* @@ -626,9 +626,9 @@ RscExpression::~RscExpression(){ |* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ -BOOL RscExpression::Evaluate( INT32 * plValue ){ - INT32 lLeft; - INT32 lRight; +sal_Bool RscExpression::Evaluate( sal_Int32 * plValue ){ + sal_Int32 lLeft; + sal_Int32 lRight; // linken und rechten Zweig auswerten if( aLeftExp.Evaluate( &lLeft ) && aRightExp.Evaluate( &lRight ) ){ @@ -648,12 +648,12 @@ BOOL RscExpression::Evaluate( INT32 * plValue ){ *plValue = lLeft << lRight; else{ if( 0L == lRight ) - return FALSE; + return sal_False; *plValue = lLeft / lRight; }; - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } /************************************************************************* @@ -712,10 +712,10 @@ ByteString RscExpression::GetMacro() |* *************************************************************************/ RscFile :: RscFile(){ - bLoaded = FALSE; - bIncFile = FALSE; - bDirty = FALSE; - bScanned = FALSE; + bLoaded = sal_False; + bIncFile = sal_False; + bDirty = sal_False; + bScanned = sal_False; } /************************************************************************* @@ -728,11 +728,11 @@ RscFile :: RscFile(){ |* *************************************************************************/ RscFile :: ~RscFile(){ - RscDepend * pDep = Remove( (ULONG)0 ); + RscDepend * pDep = Remove( (sal_uLong)0 ); while( pDep ){ delete pDep; - pDep = Remove( (ULONG)0 ); + pDep = Remove( (sal_uLong)0 ); } //von hinten nach vorne ist besser wegen der Abhaengigkeiten @@ -745,14 +745,14 @@ RscFile :: ~RscFile(){ |* |* RscFile::Depend() |* -|* Beschreibung Diese Methode gibt TRUE zurueck, wenn lDepend +|* Beschreibung Diese Methode gibt sal_True zurueck, wenn lDepend |* existiert und hinter lFree steht, oder wenn |* lDepend nicht existiert. |* Ersterstellung MM 12.11.91 |* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ -BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){ +sal_Bool RscFile::Depend( sal_uLong lDepend, sal_uLong lFree ){ RscDepend * pDep; pDep = Last(); @@ -760,15 +760,15 @@ BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){ if( pDep->GetFileKey() == lDepend ){ while( pDep ){ if( pDep->GetFileKey() == lFree ) - return TRUE; + return sal_True; pDep = Prev(); } - return FALSE; + return sal_False; } pDep = Prev(); }; - return TRUE; + return sal_True; } /************************************************************************* @@ -780,14 +780,14 @@ BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){ |* Letzte Aenderung MM 06.01.92 |* *************************************************************************/ -BOOL RscFile :: InsertDependFile( ULONG lIncFile, ULONG lPos ) +sal_Bool RscFile :: InsertDependFile( sal_uLong lIncFile, sal_uLong lPos ) { RscDepend * pDep; pDep = First(); while( pDep ){ if( pDep->GetFileKey() == lIncFile ) - return TRUE; + return sal_True; pDep = Next(); } @@ -799,7 +799,7 @@ BOOL RscFile :: InsertDependFile( ULONG lIncFile, ULONG lPos ) else Insert( new RscDepend( lIncFile ), lPos ); - return TRUE; + return sal_True; } /************************************************************************* @@ -811,7 +811,7 @@ BOOL RscFile :: InsertDependFile( ULONG lIncFile, ULONG lPos ) |* Letzte Aenderung MM 18.11.91 |* *************************************************************************/ -void RscFile :: RemoveDependFile( ULONG lDepFile ) +void RscFile :: RemoveDependFile( sal_uLong lDepFile ) { RscDepend * pDep = Last(); @@ -915,17 +915,17 @@ void RscDefTree::Remove( RscDefine * pDef ){ |* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ -BOOL RscDefTree::Evaluate( RscDefine * pDef ){ +sal_Bool RscDefTree::Evaluate( RscDefine * pDef ){ if( pDef ){ if( !Evaluate( (RscDefine *)pDef->Left() ) ) - return FALSE; + return sal_False; if( !Evaluate( (RscDefine *)pDef->Right() ) ) - return FALSE; + return sal_False; }; - return TRUE; + return sal_True; } -BOOL RscDefTree::Evaluate(){ +sal_Bool RscDefTree::Evaluate(){ return Evaluate( pDefRoot ); } @@ -973,7 +973,7 @@ RscFileTab :: ~RscFileTab(){ |* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ -ULONG RscFileTab :: Find( const ByteString & rName ) +sal_uLong RscFileTab :: Find( const ByteString & rName ) { RscFile * pFName; @@ -1009,7 +1009,7 @@ RscDefine * RscFileTab::FindDef( const char * pName ){ |* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ -RscDefine * RscFileTab::FindDef( ULONG lFileKey, const ByteString & rName ) +RscDefine * RscFileTab::FindDef( sal_uLong lFileKey, const ByteString & rName ) { RscDefine * pDef = FindDef( rName ); @@ -1030,20 +1030,20 @@ RscDefine * RscFileTab::FindDef( ULONG lFileKey, const ByteString & rName ) |* Letzte Aenderung MM 08.11.91 |* *************************************************************************/ -BOOL RscFileTab::Depend( ULONG lDepend, ULONG lFree ){ +sal_Bool RscFileTab::Depend( sal_uLong lDepend, sal_uLong lFree ){ if( lDepend == lFree ) - return TRUE; + return sal_True; RscFile * pFile = First(); while( pFile ){ if( !pFile->IsIncFile() ){ if( !pFile->Depend( lDepend, lFree ) ) - return FALSE; + return sal_False; }; pFile = Next(); }; - return TRUE; + return sal_True; } /************************************************************************* @@ -1055,17 +1055,17 @@ BOOL RscFileTab::Depend( ULONG lDepend, ULONG lFree ){ |* Letzte Aenderung MM 14.01.92 |* *************************************************************************/ -BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos, +sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, sal_uLong lPos, const RscDefine * pDefDec ) { if( lFileKey == pDefDec->GetFileKey() ){ RscFile * pFile = GetFile( pDefDec->GetFileKey() ); if( pFile && (lPos <= pFile->aDefLst.GetPos( (RscDefine *)pDefDec )) && (lPos != LIST_APPEND) ) - return FALSE; + return sal_False; } else if( !Depend( lFileKey, pDefDec->GetFileKey() ) ) - return FALSE; + return sal_False; return TestDef( lFileKey, lPos, pDefDec->pExp ); } @@ -1079,29 +1079,29 @@ BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos, |* Letzte Aenderung MM 14.01.92 |* *************************************************************************/ -BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos, +sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, sal_uLong lPos, const RscExpression * pExpDec ) { if( !pExpDec ) - return TRUE; + return sal_True; if( pExpDec->aLeftExp.IsExpression() ) if( !TestDef( lFileKey, lPos, pExpDec->aLeftExp.aExp.pExp ) ) - return FALSE; + return sal_False; if( pExpDec->aLeftExp.IsDefinition() ) if( !TestDef( lFileKey, lPos, pExpDec->aLeftExp.aExp.pDef ) ) - return FALSE; + return sal_False; if( pExpDec->aRightExp.IsExpression() ) if( !TestDef( lFileKey, lPos, pExpDec->aRightExp.aExp.pExp ) ) - return FALSE; + return sal_False; if( pExpDec->aRightExp.IsDefinition() ) if( !TestDef( lFileKey, lPos, pExpDec->aRightExp.aExp.pDef ) ) - return FALSE; + return sal_False; - return TRUE; + return sal_True; } /************************************************************************* @@ -1113,8 +1113,8 @@ BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos, |* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ -RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName, - INT32 lId, ULONG lPos ) +RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const ByteString & rDefName, + sal_Int32 lId, sal_uLong lPos ) { RscDefine * pDef = FindDef( rDefName ); @@ -1141,8 +1141,8 @@ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName, |* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ -RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName, - RscExpression * pExp, ULONG lPos ) +RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const ByteString & rDefName, + RscExpression * pExp, sal_uLong lPos ) { RscDefine * pDef = FindDef( rDefName ); @@ -1177,14 +1177,14 @@ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName, |* Letzte Aenderung MM 22.11.91 |* *************************************************************************/ -BOOL RscFileTab::IsDefUsed( const ByteString & rDefName ) +sal_Bool RscFileTab::IsDefUsed( const ByteString & rDefName ) { RscDefine * pDef = FindDef( rDefName ); if( pDef ) return( pDef->GetRefCount() != 2 ); - return FALSE; + return sal_False; } /************************************************************************* @@ -1219,7 +1219,7 @@ void RscFileTab::DeleteDef( const ByteString & rDefName ) |* Letzte Aenderung MM 11.11.91 |* *************************************************************************/ -BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId ) +sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName, sal_Int32 lId ) { RscDefine * pDef = FindDef( rDefName ); @@ -1228,7 +1228,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId ) //alle Macros neu bewerten return aDefTree.Evaluate(); }; - return( FALSE ); + return( sal_False ); } /************************************************************************* @@ -1240,12 +1240,12 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId ) |* Letzte Aenderung MM 11.11.91 |* *************************************************************************/ -BOOL RscFileTab::ChangeDef( const ByteString & rDefName, +sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName, RscExpression * pExp ) { RscDefine * pDef = FindDef( rDefName ); RscFile * pFile; - ULONG lPos = 0; + sal_uLong lPos = 0; if( pDef ){ pFile = GetFile( pDef->GetFileKey() ); @@ -1263,7 +1263,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, // geloescht werden delete pExp; - return( FALSE ); + return( sal_False ); } /************************************************************************* @@ -1275,7 +1275,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, |* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ -BOOL RscFileTab::ChangeDefName( const ByteString & rDefName, +sal_Bool RscFileTab::ChangeDefName( const ByteString & rDefName, const ByteString & rNewName ) { RscDefine * pDef = FindDef( rDefName ); @@ -1287,11 +1287,11 @@ BOOL RscFileTab::ChangeDefName( const ByteString & rDefName, aDefTree.Remove( pDef ); pDef->SetName( rNewName ); aDefTree.Insert( pDef ); - return( TRUE ); + return( sal_True ); } }; - return( FALSE ); + return( sal_False ); } /************************************************************************* @@ -1303,7 +1303,7 @@ BOOL RscFileTab::ChangeDefName( const ByteString & rDefName, |* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ -void RscFileTab :: DeleteFileContext( ULONG lFileKey ){ +void RscFileTab :: DeleteFileContext( sal_uLong lFileKey ){ RscFile * pFName; pFName = GetFile( lFileKey ); @@ -1315,7 +1315,7 @@ void RscFileTab :: DeleteFileContext( ULONG lFileKey ){ aDefTree.Remove( pDef ); pDef = pFName->aDefLst.Next(); }; - while( pFName->aDefLst.Remove( (ULONG)0 ) ) ; + while( pFName->aDefLst.Remove( (sal_uLong)0 ) ) ; } } @@ -1328,7 +1328,7 @@ void RscFileTab :: DeleteFileContext( ULONG lFileKey ){ |* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ -void RscFileTab :: DeleteFile( ULONG lFileKey ){ +void RscFileTab :: DeleteFile( sal_uLong lFileKey ){ RscFile * pFName; //Defines freigeben @@ -1355,9 +1355,9 @@ void RscFileTab :: DeleteFile( ULONG lFileKey ){ |* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ -ULONG RscFileTab :: NewCodeFile( const ByteString & rName ) +sal_uLong RscFileTab :: NewCodeFile( const ByteString & rName ) { - ULONG lKey; + sal_uLong lKey; RscFile * pFName; lKey = Find( rName ); @@ -1381,10 +1381,10 @@ ULONG RscFileTab :: NewCodeFile( const ByteString & rName ) |* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ -ULONG RscFileTab :: NewIncFile( const ByteString & rName, +sal_uLong RscFileTab :: NewIncFile( const ByteString & rName, const ByteString & rPath ) { - ULONG lKey; + sal_uLong lKey; RscFile * pFName; lKey = Find( rName ); diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 93ecff2afe43..57345d0aa893 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -144,7 +144,7 @@ ByteString GetTmpFileName() /* */ /* Description : appends text files */ /********************************************************************/ -BOOL Append( FILE * fDest, ByteString aTmpFile ) +sal_Bool Append( FILE * fDest, ByteString aTmpFile ) { #define MAX_BUF 4096 char szBuf[ MAX_BUF ]; @@ -155,7 +155,7 @@ BOOL Append( FILE * fDest, ByteString aTmpFile ) if( !fDest || !fSource ){ if( fSource ) fclose( fSource ); - return FALSE; + return sal_False; } else{ do{ // append @@ -165,14 +165,14 @@ BOOL Append( FILE * fDest, ByteString aTmpFile ) fclose( fSource ); }; - return TRUE; + return sal_True; } -BOOL Append( ByteString aOutputSrs, ByteString aTmpFile ) +sal_Bool Append( ByteString aOutputSrs, ByteString aTmpFile ) { FILE * fDest = fopen( aOutputSrs.GetBuffer(), "ab" ); - BOOL bRet = Append( fDest, aTmpFile ); + sal_Bool bRet = Append( fDest, aTmpFile ); if( fDest ) fclose( fDest ); @@ -390,10 +390,10 @@ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder ) short nSwapTest = 1; RSCBYTEORDER_TYPE nMachineOrder; - bSwap = FALSE; + bSwap = sal_False; if( nOrder != RSC_SYSTEMENDIAN ) { - if( (BYTE)*(BYTE *)&nSwapTest ) + if( (sal_uInt8)*(sal_uInt8 *)&nSwapTest ) nMachineOrder = RSC_LITTLEENDIAN; else nMachineOrder = RSC_BIGENDIAN; diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx index 991e32aa580c..e719cc39548e 100644 --- a/rsc/source/tools/rsctree.cxx +++ b/rsc/source/tools/rsctree.cxx @@ -316,12 +316,12 @@ NameNode* NameNode::Search( const void * pSearch ) const{ |* Letzte Aenderung MM 11.01.91 |* *************************************************************************/ -BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ +sal_Bool NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ // Ein Knoten wird in den Baum eingefuegt -// Gibt es einen Knoten mit dem gleichen Namen, dann return FALSE -// sonst return TRUE. Der Knoten wird auf jeden Fall eingefuegt. +// Gibt es einen Knoten mit dem gleichen Namen, dann return sal_False +// sonst return sal_True. Der Knoten wird auf jeden Fall eingefuegt. - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; int nCmp = Compare( pTN ); *pnDepth += 1; @@ -337,7 +337,7 @@ BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ else pRight = pTN; if( nCmp == EQUAL ) - bRet = FALSE; + bRet = sal_False; }; return( bRet ); } @@ -351,12 +351,12 @@ BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ |* Letzte Aenderung MM 11.01.91 |* *************************************************************************/ -BOOL NameNode::Insert( NameNode * pTN ){ +sal_Bool NameNode::Insert( NameNode * pTN ){ // insert a node in the tree. -// if the node with the same name is in, return FALSE and no insert. +// if the node with the same name is in, return sal_False and no insert. // if not return true. sal_uInt32 nDepth = 0; - BOOL bRet; + sal_Bool bRet; bRet = Insert( pTN, &nDepth ); if( bRet ){ @@ -412,14 +412,14 @@ void NameNode::SubOrderTree( NameNode * pOrderNode ){ |* *************************************************************************/ class OrderCtrl { - BOOL bOrder; + sal_Bool bOrder; NameNode * pName; DECL_LINK( CallBackFunc, NameNode * ); public: - OrderCtrl() { bOrder = FALSE; pName = NULL; } - BOOL IsOrder( const NameNode * pRoot ) + OrderCtrl() { bOrder = sal_False; pName = NULL; } + sal_Bool IsOrder( const NameNode * pRoot ) { - bOrder = TRUE; + bOrder = sal_True; pName = NULL; pRoot->EnumNodes( LINK( this, OrderCtrl, CallBackFunc ) ); return bOrder; @@ -428,13 +428,13 @@ public: IMPL_LINK_INLINE_START( OrderCtrl, CallBackFunc, NameNode *, pNext ) { if( pName && pName->Compare( pNext ) != LESS ) - bOrder = FALSE; + bOrder = sal_False; pName = pNext; return 0; } IMPL_LINK_INLINE_END( OrderCtrl, CallBackFunc, NameNode *, pNext ) -BOOL NameNode::IsOrderTree() const{ +sal_Bool NameNode::IsOrderTree() const{ OrderCtrl aOrder; return aOrder.IsOrder( this ); |