diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-03 16:20:57 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-03 16:20:57 +0000 |
| commit | 2d83432828f54f4ea6cdfc78454b145ef9d03983 (patch) | |
| tree | 78d2982d5416cc3226927a005cfd1d71ccc9a672 /rsc | |
| parent | dfb26bcf299eb7cca03564d594d59611f7f3b295 (diff) | |
INTEGRATION: CWS res32bit (1.3.18); FILE MERGED
2004/10/22 13:54:23 pl 1.3.18.1: #i34513# free rsc of 32 bit constraints
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdef.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index a07f5a1c1ac4..7845706de5d7 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -2,9 +2,9 @@ * * $RCSfile: rscdef.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-06-17 11:49:36 $ + * last change: $Author: obo $ $Date: 2005-01-03 17:20:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ public: RscDefine * pDef; struct { short nHi; - USHORT nLo; + unsigned short nLo; } aLong; } aExp; char cType; @@ -98,7 +98,7 @@ public: BOOL IsNothing() const { return( RSCEXP_NOTHING == cType ); } void SetLong( INT32 lValue ){ aExp.aLong.nHi = (short)(lValue >> 16); - aExp.aLong.nLo = (USHORT)lValue; + aExp.aLong.nLo = (unsigned short)lValue; cType = RSCEXP_LONG; } INT32 GetLong() const{ @@ -162,7 +162,7 @@ friend class RscDefTree; friend class RscExpression; friend class RscId; ULONG lFileKey; // zu welcher Datei gehoert das Define - USHORT nRefCount; // Wieviele Referenzen auf dieses Objekt + sal_uInt32 nRefCount; // Wieviele Referenzen auf dieses Objekt INT32 lId; // Identifier RscExpression * pExp; // Ausdruck protected: @@ -173,7 +173,7 @@ protected: RscExpression * pExpression ); ~RscDefine(); void IncRef(){ nRefCount++; } - USHORT GetRefCount() const { return nRefCount; } + sal_uInt32 GetRefCount() const { return nRefCount; } void DecRef(); void DefineToNumber(); void SetName( const ByteString & rNewName ){ aName = rNewName; } |