summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-01-03 16:08:51 +0000
committerOliver Bolte <obo@openoffice.org>2005-01-03 16:08:51 +0000
commitb0b8659e11d83d9a6884995f6acc807286cff5b0 (patch)
tree6ab7256825f6846cd677fe3810fe625c3d1af4ca
parentddcddd91b1730cf251ace1ce8534cc43163ac424 (diff)
INTEGRATION: CWS res32bit (1.2.290); FILE MERGED
2004/11/05 14:24:33 pl 1.2.290.2: #i34513# more adjustments for resource 32bit change 2004/10/22 16:53:00 pl 1.2.290.1: #i34513# free rsc of 32 bit constraints
-rw-r--r--tools/source/rc/resary.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx
index bc0b605c2418..c2834209e0f2 100644
--- a/tools/source/rc/resary.cxx
+++ b/tools/source/rc/resary.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: resary.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: mhu $ $Date: 2002-05-22 14:44:52 $
+ * last change: $Author: obo $ $Date: 2005-01-03 17:08:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -73,12 +73,12 @@
ResStringArray::ResStringArray( const ResId& rResId )
: Resource ( rResId.SetRT( RSC_STRINGARRAY ) ),
mpAry ( 0 ),
- mnSize ( ReadShortRes() )
+ mnSize ( ReadLongRes() )
{
if ( mnSize )
{
mpAry = new ImplResStringItem*[mnSize];
- for ( USHORT i = 0; i < mnSize; i++ )
+ for ( sal_uInt32 i = 0; i < mnSize; i++ )
{
// String laden
mpAry[i] = new ImplResStringItem( ReadStringRes() );
@@ -93,16 +93,16 @@ ResStringArray::ResStringArray( const ResId& rResId )
ResStringArray::~ResStringArray()
{
- for ( USHORT i = 0; i < mnSize; i++ )
+ for ( sal_uInt32 i = 0; i < mnSize; i++ )
delete mpAry[i];
delete[] mpAry;
}
// -----------------------------------------------------------------------
-USHORT ResStringArray::FindIndex( long nValue ) const
+sal_uInt32 ResStringArray::FindIndex( long nValue ) const
{
- for ( USHORT i = 0; i < mnSize; i++ )
+ for ( sal_uInt32 i = 0; i < mnSize; i++ )
{
if ( mpAry[i]->mnValue == nValue )
return i;