diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-03 16:39:17 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-03 16:39:17 +0000 |
| commit | 731ed7ac5351b559be9edf30f63de87bee2ee816 (patch) | |
| tree | 65a43b87c7ceb8e3a269ef3d182fa32489274bcc /vcl/source/control/field2.cxx | |
| parent | c55cf9f3385f4fdd8614f9e2bde8b03d6538ed81 (diff) | |
INTEGRATION: CWS res32bit (1.16.162); FILE MERGED
2004/12/16 14:36:11 pl 1.16.162.2: #i39154# masks are longs now
2004/11/05 14:27:26 pl 1.16.162.1: #i34513# more adjustments for resource 32bit change
Diffstat (limited to 'vcl/source/control/field2.cxx')
| -rw-r--r-- | vcl/source/control/field2.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 699977b60e50..5090ad3fba51 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: field2.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2004-04-02 10:35:20 $ + * last change: $Author: obo $ $Date: 2005-01-03 17:39:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -897,7 +897,7 @@ void PatternFormatter::ImplLoadRes( const ResId& rResId ) ByteString aEditMask; XubString aLiteralMask; ResMgr* pMgr = Resource::GetResManager(); - USHORT nMask = pMgr->ReadShort(); + ULONG nMask = pMgr->ReadLong(); if ( PATTERNFORMATTER_STRICTFORMAT & nMask ) SetStrictFormat( (BOOL)pMgr->ReadShort() ); @@ -1705,7 +1705,7 @@ DateFormatter::DateFormatter() : void DateFormatter::ImplLoadRes( const ResId& ) { ResMgr* pMgr = Resource::GetResManager(); - USHORT nMask = pMgr->ReadShort(); + ULONG nMask = pMgr->ReadLong(); if ( DATEFORMATTER_MIN & nMask ) { @@ -2149,7 +2149,7 @@ void DateField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); DateFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes() ) ); - USHORT nMask = ReadShortRes(); + ULONG nMask = ReadLongRes(); if ( DATEFIELD_FIRST & nMask ) { @@ -2873,7 +2873,7 @@ TimeFormatter::TimeFormatter() : void TimeFormatter::ImplLoadRes( const ResId& ) { ResMgr* pMgr = Resource::GetResManager(); - USHORT nMask = pMgr->ReadShort(); + ULONG nMask = pMgr->ReadLong(); if ( TIMEFORMATTER_MIN & nMask ) { @@ -2888,7 +2888,7 @@ void TimeFormatter::ImplLoadRes( const ResId& ) } if ( TIMEFORMATTER_TIMEFIELDFORMAT & nMask ) - meFormat = (TimeFieldFormat)pMgr->ReadShort(); + meFormat = (TimeFieldFormat)pMgr->ReadLong(); if ( TIMEFORMATTER_DURATION & nMask ) mbDuration = (BOOL)pMgr->ReadShort(); @@ -3199,7 +3199,7 @@ void TimeField::ImplLoadRes( const ResId& rResId ) SpinField::ImplLoadRes( rResId ); TimeFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes() ) ); - USHORT nMask = ReadShortRes(); + ULONG nMask = ReadLongRes(); if ( TIMEFIELD_FIRST & nMask ) { |