summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rsc/inc/rscarray.hxx40
-rw-r--r--rsc/inc/rscconst.hxx41
2 files changed, 40 insertions, 41 deletions
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index 7af83d3a8e2a..20a4c0aefb56 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: rscarray.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hjs $ $Date: 2004-06-26 20:23:44 $
+ * last change: $Author: obo $ $Date: 2005-01-03 17:19:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -76,15 +76,15 @@ class RscEnum;
/******************* R s c A r r a y ************************************/
class RscInstNode : public IdNode
{
- USHORT nTypeId;
+ sal_uInt32 nTypeId;
public:
RSCINST aInst;
- RscInstNode( USHORT nId );
+ RscInstNode( sal_uInt32 nId );
~RscInstNode();
- virtual USHORT GetId() const;
+ virtual sal_uInt32 GetId() const;
RscInstNode * Left() const { return (RscInstNode *)pLeft ; };
RscInstNode * Right() const{ return (RscInstNode *)pRight ; };
- RscInstNode * Search( USHORT nId ) const
+ RscInstNode * Search( sal_uInt32 nId ) const
{
return (RscInstNode *)IdNode::Search( nId );
}
@@ -102,13 +102,13 @@ class RscArray : public RscTop
{
protected:
RscEnum * pTypeClass; // Typ der Eintraege
- USHORT nSize; // Groesse der Instanzdaten dieser Klasse
+ sal_uInt32 nSize; // Groesse der Instanzdaten dieser Klasse
// mit Superklassen
- USHORT nOffInstData;// Offset auf eigen Instanzdaten
+ sal_uInt32 nOffInstData;// Offset auf eigen Instanzdaten
void WriteSrcArray( const RSCINST & rInst, FILE * fOutput,
- RscTypCont * pTC, USHORT nTab, const char * );
+ RscTypCont * pTC, sal_uInt32 nTab, const char * );
public:
- RscArray( HASHID nId, USHORT nTypId,
+ RscArray( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper, RscEnum * pTypeClass );
~RscArray();
virtual RSCCLASS_TYPE GetClassType() const;
@@ -123,12 +123,12 @@ public:
virtual ERRTYPE GetValueEle( const RSCINST & rInst, INT32 lValue,
RscTop * pCreateClass,
RSCINST * pGetInst );
- virtual ERRTYPE GetArrayEle( const RSCINST & rInst, HASHID nId,
+ virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId,
RscTop * pCreateClass,
RSCINST * pGetInst );
// Gibt die Groesse der Klasse in Bytes
- USHORT Size(){ return( nSize ); };
+ sal_uInt32 Size(){ return( nSize ); };
BOOL IsConsistent( const RSCINST & rInst, RscInconsList * pList );
virtual void SetToDefault( const RSCINST & rInst );
@@ -136,12 +136,12 @@ public:
BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
- RscTypCont * pTC, USHORT nTab,
+ RscTypCont * pTC, sal_uInt32 nTab,
const RscId & aId, const char * );
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
- RscTypCont * pTC, USHORT nTab, const char * );
+ RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, USHORT, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, BOOL bExtra );
virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
const char * );
};
@@ -149,24 +149,24 @@ public:
class RscClassArray : public RscArray
{
public:
- RscClassArray( HASHID nId, USHORT nTypId,
+ RscClassArray( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper, RscEnum * pTypeClass );
~RscClassArray();
virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
- RscTypCont * pTC, USHORT nTab,
+ RscTypCont * pTC, sal_uInt32 nTab,
const RscId & aId, const char * );
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
- RscTypCont * pTC, USHORT nTab, const char * );
+ RscTypCont * pTC, sal_uInt32 nTab, const char * );
virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, const RscId & aId,
- USHORT nDeep, BOOL bExtra );
+ sal_uInt32 nDeep, BOOL bExtra );
};
class RscLangArray : public RscArray
{
public:
- RscLangArray( HASHID nId, USHORT nTypId,
+ RscLangArray( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper, RscEnum * pTypeClass );
virtual RSCCLASS_TYPE GetClassType() const;
};
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 272fb62d450a..ce4b50c63fc1 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: rscconst.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hjs $ $Date: 2004-06-26 20:23:55 $
+ * last change: $Author: obo $ $Date: 2005-01-03 17:20:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,22 +79,22 @@ class RscConst : public RscTop
{
protected:
struct VarEle {
- HASHID nId; // Name der Konstante
+ Atom nId; // Name der Konstante
INT32 lValue; // Wert der Konstante
};
VarEle * pVarArray; // Zeiger auf das Feld mit Konstanten
- USHORT nEntries; // Anzahle der Eintraege im Feld
+ sal_uInt32 nEntries; // Anzahle der Eintraege im Feld
public:
- RscConst( HASHID nId, USHORT nTypId );
+ RscConst( Atom nId, sal_uInt32 nTypId );
~RscConst();
virtual RSCCLASS_TYPE GetClassType() const;
- USHORT GetEntryCount() const { return nEntries; }
+ sal_uInt32 GetEntryCount() const { return nEntries; }
// Die erlaubten Werte werden gesetzt
- ERRTYPE SetConstant( HASHID nVarName, INT32 lValue );
- HASHID GetConstant( USHORT nPos );
- BOOL GetConstValue( HASHID nConstId, INT32 * pVal ) const;
- BOOL GetValueConst( INT32 nValue, HASHID * pConstId ) const;
- USHORT GetConstPos( HASHID nConstId );
+ ERRTYPE SetConstant( Atom nVarName, INT32 lValue );
+ Atom GetConstant( sal_uInt32 nPos );
+ BOOL GetConstValue( Atom nConstId, INT32 * pVal ) const;
+ BOOL GetValueConst( INT32 nValue, Atom * pConstId ) const;
+ sal_uInt32 GetConstPos( Atom nConstId );
virtual void WriteSyntax( FILE * fOutput, RscTypCont * pTC );
virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
const char * );
@@ -103,15 +103,14 @@ public:
/******************* R s c E n u m ***************************************/
class RscEnum : public RscConst {
struct RscEnumInst {
- USHORT nValue; // Position der Konstanten im Array
+ sal_uInt32 nValue; // Position der Konstanten im Array
BOOL bDflt; // Ist Default
};
- USHORT nSize;
- BOOL bUSHORT;
+ sal_uInt32 nSize;
public:
- RscEnum( HASHID nId, USHORT nTypId, BOOL bUSHORT = TRUE );
+ RscEnum( Atom nId, sal_uInt32 nTypId );
RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL );
- USHORT Size(){ return nSize; }
+ sal_uInt32 Size(){ return nSize; }
virtual void SetToDefault( const RSCINST & rInst )
{
@@ -124,20 +123,20 @@ public:
// Als Default setzen
BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
- ERRTYPE SetConst( const RSCINST & rInst, HASHID nValueId,
+ ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId,
INT32 nValue );
ERRTYPE SetNumber( const RSCINST & rInst, INT32 nValue );
- ERRTYPE GetConst( const RSCINST & rInst, HASHID * );
+ ERRTYPE GetConst( const RSCINST & rInst, Atom * );
ERRTYPE GetNumber( const RSCINST & rInst, INT32 * nValue );
void WriteSrc( const RSCINST &rInst, FILE * fOutput,
- RscTypCont * pTC, USHORT nTab, const char * );
+ RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, USHORT, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, BOOL bExtra );
};
class RscNameTable;
-USHORT GetLangId( const ByteString& alang);
+sal_uInt32 GetLangId( const ByteString& alang);
class RscLangEnum : public RscEnum
{
generated by cgit (git 2.34.1) at 2024-08-21 02:59:43 +0000