diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-03 16:39:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-03 16:39:01 +0000 |
| commit | c55cf9f3385f4fdd8614f9e2bde8b03d6538ed81 (patch) | |
| tree | e0a467c096bc490155c203e6f3af4ccdfa09c6e9 /vcl/source/control | |
| parent | 2fe2a1633ba8b33e415c391b45a37d4fe67e66b4 (diff) | |
INTEGRATION: CWS res32bit (1.11.236); FILE MERGED
2004/11/05 14:27:26 pl 1.11.236.1: #i34513# more adjustments for resource 32bit change
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/field.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index f262c9b88adc..f817dcfc7887 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -2,9 +2,9 @@ * * $RCSfile: field.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2004-01-06 13:17:34 $ + * last change: $Author: obo $ $Date: 2005-01-03 17:39:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -473,9 +473,9 @@ NumericFormatter::NumericFormatter() void NumericFormatter::ImplLoadRes( const ResId& rResId ) { ResMgr* pMgr = Resource::GetResManager(); - USHORT nMask; + ULONG nMask; - nMask = pMgr->ReadShort(); + nMask = pMgr->ReadLong(); if ( NUMERICFORMATTER_MIN & nMask ) mnMin = pMgr->ReadLong(); @@ -801,7 +801,7 @@ void NumericField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); NumericFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes() ) ); - USHORT nMask = ReadShortRes(); + ULONG nMask = ReadLongRes(); if ( NUMERICFIELD_FIRST & nMask ) mnFirst = ReadLongRes(); @@ -1461,10 +1461,10 @@ void MetricFormatter::ImplLoadRes( const ResId& rResId ) NumericFormatter::ImplLoadRes( rResId ); ResMgr* pMgr = Resource::GetResManager(); - USHORT nMask = pMgr->ReadShort(); + ULONG nMask = pMgr->ReadLong(); if ( METRICFORMATTER_UNIT & nMask ) - meUnit = (FieldUnit)pMgr->ReadShort(); + meUnit = (FieldUnit)pMgr->ReadLong(); if ( METRICFORMATTER_CUSTOMUNITTEXT & nMask ) maCustomUnitText = pMgr->ReadString(); @@ -1688,7 +1688,7 @@ void MetricField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); MetricFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes() ) ); - USHORT nMask = ReadShortRes(); + ULONG nMask = ReadLongRes(); if ( METRICFIELD_FIRST & nMask ) mnFirst = ReadLongRes(); @@ -2182,7 +2182,7 @@ void CurrencyField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); CurrencyFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes() ) ); - USHORT nMask = ReadShortRes(); + ULONG nMask = ReadLongRes(); if ( CURRENCYFIELD_FIRST & nMask ) mnFirst = ReadLongRes(); |