summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-06-17 10:52:45 +0000
committerRüdiger Timm <rt@openoffice.org>2004-06-17 10:52:45 +0000
commit52e1534c53ff71da518e8468b6565bc26f760cbe (patch)
treee42142e5f029727d2251b425953399410aa30fba /rsc
parent6ba2144071621695a94d7f9ec774ab2874357004 (diff)
INTEGRATION: CWS ooo64bit01 (1.2.104); FILE MERGED
2004/04/13 03:40:22 fa 1.2.104.1: #i8580# make resouce compiler 64-bit clean #i8582# make tools portions of resource code 64-bit clean
Diffstat (limited to 'rsc')
-rw-r--r--rsc/source/res/rsccont.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index f232dce8a504..13c40043e82f 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: rsccont.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: pl $ $Date: 2001-10-10 11:51:25 $
+ * last change: $Author: rt $ $Date: 2004-06-17 11:52:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -542,11 +542,11 @@ else
|* Letzte Aenderung MM 12.06.91
|*
*************************************************************************/
-ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, long lValue ){
+ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, INT32 lValue ){
RscBaseContInst * pClassData;
RSCINST aTmpI;
ERRTYPE aError;
- long lNumber;
+ INT32 lNumber;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -618,7 +618,7 @@ ERRTYPE RscBaseCont::SetConst
(
const RSCINST & rInst,
HASHID nValueId,
- long lValue
+ INT32 lValue
)
{
RscBaseContInst * pClassData;
@@ -715,8 +715,8 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){
// Komplexitaet = n^2 / 2
for( i = 0; i < pClassData->nEntries; i++ ){
if( !bNoId ){
- if( (long)pClassData->pEntries[ i ].aName > 0x7FFF
- || (long)pClassData->pEntries[ i ].aName < 1 ){
+ if( (INT32)pClassData->pEntries[ i ].aName > 0x7FFF
+ || (INT32)pClassData->pEntries[ i ].aName < 1 ){
bRet = FALSE;
if( pList )
pList->Insert( new RscInconsistent(