diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 10:52:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 10:52:18 +0000 |
| commit | 64016996343428ad39bc676f2b7f65a06f2d4729 (patch) | |
| tree | 8acb72be9bca9b7a6fcef7681881eff287e3f5f1 /rsc | |
| parent | ab0fd1f6a6c7f52d8930dee5f40f002bffd93560 (diff) | |
INTEGRATION: CWS ooo64bit01 (1.2.104); FILE MERGED
2004/04/13 03:40:21 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/rscarray.cxx | 6 | ||||
| -rw-r--r-- | rsc/source/res/rscclass.cxx | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx index 15cf81f93f21..f34e6f2c9833 100644 --- a/rsc/source/res/rscarray.cxx +++ b/rsc/source/res/rscarray.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rscarray.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:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -284,7 +284,7 @@ void RscArray::Destroy( const RSCINST & rInst ) ERRTYPE RscArray::GetValueEle ( const RSCINST & rInst, - long lValue, + INT32 lValue, RscTop * pCreateClass, RSCINST * pGetInst ) diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 87f10b5c3c68..3255ae82a616 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rscclass.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:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -311,7 +311,7 @@ RSCINST RscClass::Create ((RscClassInst *)(aInst.pData + nSuperSize))->nVarDflt = ((RscClassInst *)(rDflt.pData + nSuperSize))->nVarDflt; else - ((RscClassInst *)(aInst.pData + nSuperSize))->nVarDflt = 0xFFFFFFFF; + ((RscClassInst *)(aInst.pData + nSuperSize))->nVarDflt = ~((ULONG)0); for( i = 0; i < nEntries; i++ ) { @@ -645,7 +645,7 @@ void RscClass::SetToDefault( const RSCINST & rInst ) aTmpI.pClass->SetToDefault( aTmpI ); } } - pClass->nVarDflt = 0xFFFFFFFF; // alles auf Default + pClass->nVarDflt = ~((ULONG)0); // alles auf Default RscTop::SetToDefault( rInst ); } @@ -896,7 +896,7 @@ void RscClass::WriteSrc |* Beschreibung |* *************************************************************************/ -long RscClass::GetCorrectValues +INT32 RscClass::GetCorrectValues ( const RSCINST & rInst, USHORT nVarPos, @@ -904,8 +904,8 @@ long RscClass::GetCorrectValues RscTypCont * pTC ) { - long nLang = 0; - long nBaseValue; + INT32 nLang = 0; + INT32 nBaseValue; // Basiswert holen RSCINST aTmpI = GetInstData( rInst.pData, nVarPos, TRUE ); |