INTEGRATION: CWS ooo64bit01 (1.2.104); FILE MERGED

2004/04/13 03:40:18 fa 1.2.104.1: #i8580# make resouce compiler 64-bit clean
#i8582# make tools portions of resource code 64-bit clean

2 files changed, 15 insertions, 15 deletions

diff --git a/rsc/inc/rscinst.hxx b/rsc/inc/rscinst.hxx
index 3ee277fc98b1..fe29b975e3ef 100644
--- a/rsc/inc/rscinst.hxx
+++ b/rsc/inc/rscinst.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rscinst.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pl $ $Date: 2001-10-10 11:51:13 $
+ *  last change: $Author: rt $ $Date: 2004-06-17 11:50:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,13 +119,13 @@ public:
 
     // Hack fuer X, Y, Width, Height
     static ERRTYPE SetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
-                                    long lValue, USHORT nTupelIdx );
-    ERRTYPE     SetNumber( HASHID nVarName, long );
+                                    INT32 lValue, USHORT nTupelIdx );
+    ERRTYPE     SetNumber( HASHID nVarName, INT32 );
 
     ERRTYPE     SetString( HASHID nVarName, const char * );
     ERRTYPE     SetConst( HASHID nConstId );
     ERRTYPE     SetBool( BOOL );
-    ERRTYPE     SetNumber( long );
+    ERRTYPE     SetNumber( INT32 );
     ERRTYPE     SetString( const char * );
     ERRTYPE     SetRef( const RscId & rRscId );
     ERRTYPE     SetDefault( HASHID nVarName );
@@ -136,9 +136,9 @@ public:
     BOOL        GetBool( HASHID nVarName = HASH_NONAME );
 
     // Hack fuer X, Y, Width, Height
-    static long GetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
+    static INT32 GetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
                                     USHORT nTupelIdx );
-    long        GetNumber( HASHID nVarName = HASH_NONAME );
+    INT32       GetNumber( HASHID nVarName = HASH_NONAME );
 
     const char *GetString( HASHID nVarName = HASH_NONAME );
     RscId       GetRef();
@@ -236,11 +236,11 @@ public:
     RscDefineList * GetDefineList();
                 // Suche ueber all DEFINES im Zugriff
     RscDefine * FindDef( const ByteString & rName );
-    ERRTYPE     NewDef( const ByteString & rMacroName, long lValue,
+    ERRTYPE     NewDef( const ByteString & rMacroName, INT32 lValue,
                         ULONG lPos );
     ERRTYPE     NewDef( const ByteString & rMacroName, const ByteString & rMacro,
                         ULONG lPos );
-    ERRTYPE     ChangeDef( const ByteString & rMacroName, long lValue );
+    ERRTYPE     ChangeDef( const ByteString & rMacroName, INT32 lValue );
     ERRTYPE     ChangeDef( const ByteString & rMacroName,
                            const ByteString & rMacro );
     BOOL        IsDefUsed( const ByteString & );
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 3dd007f77ce0..c748d5d1bfbc 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rsctop.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pl $ $Date: 2001-10-10 11:51:13 $
+ *  last change: $Author: rt $ $Date: 2004-06-17 11:50:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,7 +171,7 @@ public:
 
                     // Liefert Instanz aus einem Feld zurueck
                     // pGetInst im return kann NULL sein
-    virtual ERRTYPE GetValueEle( const RSCINST & rInst, long lValue,
+    virtual ERRTYPE GetValueEle( const RSCINST & rInst, INT32 lValue,
                                 RscTop * pCreateClass,
                                 RSCINST * pGetInst );
 
@@ -203,21 +203,21 @@ public:
     virtual USHORT GetCount( const RSCINST & rInst );
 
                     // Eine Zuweisung an eine Variable
-    virtual ERRTYPE SetNumber( const RSCINST & rInst, long lValue );
+    virtual ERRTYPE SetNumber( const RSCINST & rInst, INT32 lValue );
 
                     // Eine Zuweisung an eine Variable
     virtual ERRTYPE SetBool( const RSCINST & rInst, BOOL bValue );
 
                     // Eine Zuweisung an eine Variable
     virtual ERRTYPE SetConst( const RSCINST & rInst, HASHID nValueId,
-                              long nValue );
+                              INT32 nValue );
 
                     // Eine Zuweisung an eine Variable
     virtual ERRTYPE SetNotConst( const RSCINST & rInst, HASHID nId );
 
     virtual ERRTYPE SetString( const RSCINST & rInst, char * pStr );
 
-    virtual ERRTYPE GetNumber( const RSCINST & rInst, long * pN );
+    virtual ERRTYPE GetNumber( const RSCINST & rInst, INT32 * pN );
 
     virtual ERRTYPE GetBool( const RSCINST & rInst, BOOL * pB );