diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 14:51:00 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 14:51:00 +0000 |
| commit | 4579ce1dd7047fc0b82d311948d18112f74b44fe (patch) | |
| tree | b7988f2c72e04c46a50f3f5602b3dfd8aedfb6ff /idl | |
| parent | 7a46ec3a40389052257f88f4f88d9b07231673c8 (diff) | |
INTEGRATION: CWS ooo20031110 (1.11.38); FILE MERGED
2003/11/10 12:47:59 waratah 1.11.38.1: #i22301# Correct for scoping rules
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/source/objects/slot.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 8711b65c7638..070a321e2f49 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -2,9 +2,9 @@ * * $RCSfile: slot.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: mba $ $Date: 2002-09-03 10:47:20 $ + * last change: $Author: rt $ $Date: 2003-12-01 15:51:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1108,6 +1108,8 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, USHORT nId = (USHORT) GetSlotId().GetValue(); USHORT nListCount = (USHORT) rList.Count(); USHORT nPos; + ULONG m; // for inner "for" loop + if ( !nListCount ) nPos = 0; else if ( nListCount == 1 ) @@ -1178,7 +1180,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, aSId += aValName.Copy( pEnum->GetPrefix().Len() ); xEnumSlot = NULL; - for( ULONG m=0; m<rBase.GetAttrList().Count(); m++ ) + for( m=0; m<rBase.GetAttrList().Count(); m++ ) { SvMetaAttribute * pAttr = rBase.GetAttrList().GetObject( m ); if( pAttr->GetSlotId() == aSId ) |