summaryrefslogtreecommitdiff
path: root/rsc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'rsc/inc')
-rw-r--r--rsc/inc/rscall.h2
-rw-r--r--rsc/inc/rscarray.hxx14
-rw-r--r--rsc/inc/rscclass.hxx34
-rw-r--r--rsc/inc/rscclobj.hxx16
-rw-r--r--rsc/inc/rscconst.hxx26
-rw-r--r--rsc/inc/rsccont.hxx36
-rw-r--r--rsc/inc/rscdb.hxx44
-rw-r--r--rsc/inc/rscdef.hxx140
-rw-r--r--rsc/inc/rscerror.h6
-rw-r--r--rsc/inc/rscflag.hxx28
-rw-r--r--rsc/inc/rscinst.hxx60
-rw-r--r--rsc/inc/rsckey.hxx8
-rw-r--r--rsc/inc/rsclst.hxx8
-rw-r--r--rsc/inc/rscmgr.hxx16
-rw-r--r--rsc/inc/rscpar.hxx24
-rw-r--r--rsc/inc/rscrange.hxx90
-rw-r--r--rsc/inc/rscrsc.hxx4
-rw-r--r--rsc/inc/rscstr.hxx12
-rw-r--r--rsc/inc/rsctools.hxx12
-rw-r--r--rsc/inc/rsctop.hxx30
-rw-r--r--rsc/inc/rsctree.hxx6
-rw-r--r--rsc/inc/vclrsc.hxx4
22 files changed, 310 insertions, 310 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..d0a66cd2b301 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_uIntPtr 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..a1eb7affc23d 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_uIntPtr 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_uIntPtr lKey );
+ ObjNode * DelObjNode( RscTop * pClass, sal_uIntPtr lFileKey );
sal_uInt32 GetId() const;
RscId GetRscId(){ return( aRscId ); }
- ULONG GetFileKey(){ return lFileKey; };
+ sal_uIntPtr 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 1d5af35de9ff..c9cc02cfaa40 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_uIntPtr 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
@@ -146,8 +146,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();
@@ -266,7 +266,7 @@ class RscTypCont
void InsWinBit( RscTop * pClass, const ByteString & rName,
Atom nVal );
- void WriteInc( FILE * fOutput, ULONG lKey );
+ void WriteInc( FILE * fOutput, sal_uIntPtr 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_uIntPtr> 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_uIntPtr 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_uIntPtr nFileIndex,
+ CharSet nCharSet, sal_Bool bName = sal_True );
+ ERRTYPE WriteHxx( FILE * fOutput, sal_uIntPtr nFileKey);
+ ERRTYPE WriteCxx( FILE * fOutput, sal_uIntPtr 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_uIntPtr lFileKey );
+ sal_Bool MakeConsistent( RscInconsList * pList );
sal_uInt32 PutTranslatorKey( sal_uInt64 nKey );
- void IncFilePos( ULONG nOffset ){ nFilePos += nOffset; }
+ void IncFilePos( sal_uIntPtr nOffset ){ nFilePos += nOffset; }
};
#endif
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index a21b03685325..68dc47a47419 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_uIntPtr 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_uIntPtr lFileKey, const ByteString & rDefName,
+ sal_Int32 lDefId );
+ RscDefine( sal_uIntPtr 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_uIntPtr 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_uIntPtr lFileKey, const ByteString & rDefName,
+ sal_Int32 lDefId, sal_uIntPtr lPos );
+ RscDefine * New( sal_uIntPtr lFileKey, const ByteString & rDefName,
+ RscExpression * pExpression, sal_uIntPtr lPos );
+ sal_Bool Befor( const RscDefine * pFree, const RscDefine * pDepend );
+ sal_Bool Remove( RscDefine * pDef );
+ sal_Bool Remove( sal_uIntPtr 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_uIntPtr lKey;
public:
- RscDepend( ULONG lIncKey ){ lKey = lIncKey; };
- ULONG GetFileKey(){ return lKey; }
+ RscDepend( sal_uIntPtr lIncKey ){ lKey = lIncKey; };
+ sal_uIntPtr 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_uIntPtr lDepFile, sal_uIntPtr lPos );
+ void RemoveDependFile( sal_uIntPtr lDepFile );
+ sal_Bool Depend( sal_uIntPtr lDepend, sal_uIntPtr 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_uIntPtr 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_uIntPtr lKey, const ByteString & );
- BOOL Depend( ULONG lDepend, ULONG lFree );
- BOOL TestDef( ULONG lFileKey, ULONG lPos,
+ sal_Bool Depend( sal_uIntPtr lDepend, sal_uIntPtr lFree );
+ sal_Bool TestDef( sal_uIntPtr lFileKey, sal_uIntPtr lPos,
const RscDefine * pDefDec );
- BOOL TestDef( ULONG lFileKey, ULONG lPos,
+ sal_Bool TestDef( sal_uIntPtr lFileKey, sal_uIntPtr 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_uIntPtr lKey, const ByteString & rDefName,
+ sal_Int32 lId, sal_uIntPtr lPos );
+ RscDefine * NewDef( sal_uIntPtr lKey, const ByteString & rDefName,
+ RscExpression *, sal_uIntPtr 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_uIntPtr lKey );
+ void DeleteFile( sal_uIntPtr lKey );
+ sal_uIntPtr NewCodeFile( const ByteString & rName );
+ sal_uIntPtr NewIncFile( const ByteString & rName, const ByteString & rPath );
+ RscFile * GetFile( sal_uIntPtr 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..5e21d31ea88c 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_uIntPtr lKey );
- ULONG AddSrcFile( const ByteString & rFileName );
- ULONG AddHrcFile( const ByteString & rFileName );
+ sal_uIntPtr AddSrcFile( const ByteString & rFileName );
+ sal_uIntPtr 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_uIntPtr lFileKey );
+ void RemoveFile( sal_uIntPtr lKey );
// Suche ueber alle DEFINES
RscDefine * FindDef( const ByteString & rName );
- ULONG GetFileKey( const ByteString & rFileName );
+ sal_uIntPtr GetFileKey( const ByteString & rFileName );
};
class RscHrc
{
protected:
- ULONG lFileKey; // Index der Instanz
+ sal_uIntPtr lFileKey; // Index der Instanz
RscDataBase * pDataBase;// Datenbasis
public:
// Kompilerinstanz erzeugen
- RscHrc( RscDataBase * pDBase, ULONG lKey );
+ RscHrc( RscDataBase * pDBase, sal_uIntPtr lKey );
~RscHrc();
// Daten von Datei uebernehmen
ERRTYPE ReadFile();
- ULONG GetFileKey() const { return lFileKey; }
+ sal_uIntPtr 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_uIntPtr lKey, sal_uIntPtr 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_uIntPtr lPos );
ERRTYPE NewDef( const ByteString & rMacroName, const ByteString & rMacro,
- ULONG lPos );
- ERRTYPE ChangeDef( const ByteString & rMacroName, INT32 lValue );
+ sal_uIntPtr 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_uIntPtr 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..0f3a3f8c1ad1 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_uIntPtr lFileIndex; // Index auf Eingabedatei
+ sal_uIntPtr 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_uIntPtr lIndexSrc,
+ sal_uIntPtr lFileIndex, FILE * fFile );
+ RscFileInst( RscTypCont * pTC, sal_uIntPtr lIndexSrc,
+ sal_uIntPtr 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_uIntPtr lFIndex ) { lFileIndex = lFIndex; }
+ sal_uIntPtr GetFileIndex() { return( lFileIndex ); }
+ sal_uIntPtr 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..1bf311b4eb76 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_uIntPtr lFileKey );
+ ERRTYPE ParseOneFile( sal_uIntPtr 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/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx
index 19677171dcb2..0bcc1d03fd07 100644
--- a/rsc/inc/vclrsc.hxx
+++ b/rsc/inc/vclrsc.hxx
@@ -163,8 +163,8 @@ typedef sal_Int64 WinBits;
// --------------
// from vcl/inc/help.hxx
-#define OOO_HELP_INDEX ((ULONG)0xFFFFFFFF)
-#define OOO_HELP_HELPONHELP ((ULONG)0xFFFFFFFE)
+#define OOO_HELP_INDEX ((sal_uIntPtr)0xFFFFFFFF)
+#define OOO_HELP_HELPONHELP ((sal_uIntPtr)0xFFFFFFFE)
// --------------
// - FieldTypes -
generated by cgit (git 2.34.1) at 2025-01-30 23:34:50 +0000