INTEGRATION: CWS res32bit (1.2.152); FILE MERGED

2004/10/22 13:54:27 pl 1.2.152.1: #i34513# free rsc of 32 bit constraints

2 files changed, 21 insertions, 21 deletions

diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx
index 517b0bb0a658..babbd1d119aa 100644
--- a/rsc/inc/rsckey.hxx
+++ b/rsc/inc/rsckey.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rsckey.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pl $ $Date: 2001-10-10 11:51:13 $
+ *  last change: $Author: obo $ $Date: 2005-01-03 17:22:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,28 +69,28 @@ class RscTop;
 #endif
 
 typedef struct {
-    HASHID          nName;
-    USHORT          nTyp;
+    Atom          nName;
+    sal_uInt32          nTyp;
     long            yylval;
 } KEY_STRUCT;
 
 class RscNameTable {
     BOOL            bSort;      //soll bei jedem einfuegen sortiert werden?
-    USHORT          nEntries;   //Anzahl der Eintr�ge
+    sal_uInt32          nEntries;   //Anzahl der Eintr�ge
     KEY_STRUCT *    pTable;
 public:
             RscNameTable();
             ~RscNameTable();
     void    SetSort( BOOL bSorted = TRUE );
-    HASHID  Put( HASHID nName, USHORT nTyp, long nValue );
-    HASHID  Put( HASHID nName, USHORT nTyp );
-    HASHID  Put( const char * pName, USHORT nTyp, long nValue );
-    HASHID  Put( const char * pName, USHORT nTyp );
-    HASHID  Put( HASHID nName, USHORT nTyp, RscTop * pClass );
-    HASHID  Put( const char * pName, USHORT nTyp, RscTop * pClass );
+    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 );
+    Atom  Put( const char * pName, sal_uInt32 nTyp );
+    Atom  Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass );
+    Atom  Put( const char * pName, sal_uInt32 nTyp, RscTop * pClass );
 
             // TRUE, wurde gefunden
-    BOOL    Get( HASHID nName, KEY_STRUCT * pEle );
+    BOOL    Get( Atom nName, KEY_STRUCT * pEle );
 };
 
 
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index d45807f063d1..c7459efb7c04 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rscmgr.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pl $ $Date: 2001-10-10 11:51:13 $
+ *  last change: $Author: obo $ $Date: 2005-01-03 17:22:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,9 +85,9 @@ class RscMgr : public RscClass {
         void Create(){ aRefId.Create(); bDflt = TRUE; }
         void Destroy(){ aRefId.Destroy(); }
     };
-    ERRTYPE         IsToDeep( const RSCINST & rInst, USHORT nDeep = 0 );
+    ERRTYPE         IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep = 0 );
 public:
-                    RscMgr( HASHID nId, USHORT nTypId, RscTop * pSuperCl );
+                    RscMgr( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
 
     void            SetToDefault( const RSCINST & rInst );
     BOOL            IsDefault( const RSCINST & rInst );
@@ -95,18 +95,18 @@ public:
 
     RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, BOOL );
     void            Destroy( const RSCINST & rInst );
-    USHORT          Size();
+    sal_uInt32          Size();
     void            WriteSrcHeader( const RSCINST & aInst, FILE * fOutput,
-                            RscTypCont * pTC, USHORT nTab,
+                            RscTypCont * pTC, sal_uInt32 nTab,
                             const RscId & rId, const char * );
 
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, USHORT nTab, const char * );
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * );
     ERRTYPE         WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
                                    RscTypCont * pTC, const RscId & rId,
-                                   USHORT, BOOL bExtra );
+                                   sal_uInt32, BOOL bExtra );
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, USHORT, BOOL bExtra );
+                             RscTypCont * pTC, sal_uInt32, BOOL bExtra );
     ERRTYPE         WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
                                     RscTypCont * pTC, const RscId & rId );
     ERRTYPE         WriteHxx( const RSCINST & rInst, FILE * fOutput,