diff options
author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 16:56:47 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 16:56:47 +0000 |
commit | 3c65e2b8d19b78337b7f2c0ad077e3db138df7b4 (patch) | |
tree | 72f385caf0e7ffeb61be247a1cb94a6fa1d78b44 /rdbmaker | |
parent | efd7afb02082eb0ec3df0bf4a6493850d0c866bb (diff) |
INTEGRATION: CWS ooo20031110 (1.5.18); FILE MERGED
2003/11/10 13:15:00 waratah 1.5.18.1: #i22301# Correct for scoping rules
Diffstat (limited to 'rdbmaker')
-rw-r--r-- | rdbmaker/source/rdbmaker/typeblop.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx index c1eb3db8ba4d..3ac7adc38816 100644 --- a/rdbmaker/source/rdbmaker/typeblop.cxx +++ b/rdbmaker/source/rdbmaker/typeblop.cxx @@ -2,9 +2,9 @@ * * $RCSfile: typeblop.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2003-04-17 10:24:15 $ + * last change: $Author: rt $ $Date: 2003-12-01 17:56:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -262,7 +262,9 @@ void writeMethodData( RegistryTypeWriter& rWriter, sal_uInt32 calculatedMemberOf methodMode, paramCount, exceptionCount, OUString()); RTParamMode paramMode = RT_PARAM_IN; - for (sal_uInt16 i=0; i < paramCount; i++) + sal_uInt16 i; + + for ( i=0; i < paramCount; i++) { Reference< XMethodParameter > xParam = parameters[i]; if ( xParam->isIn() && xParam->isOut()) @@ -394,8 +396,9 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) sal_uInt16 memberCount = (sal_uInt16)memberTypes.getLength(); sal_uInt16 constCount = 0; + sal_Int16 i; - for (sal_Int16 i=0; i < memberCount; i++) + for ( i=0; i < memberCount; i++) { if ( TypeClass_CONSTANT == memberTypes[i]->getTypeClass() ) constCount++; @@ -437,8 +440,9 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) sal_uInt16 memberCount = (sal_uInt16)memberTypes.getLength(); sal_uInt16 attrCount = 0; sal_uInt16 inheritedMemberCount = 0; + sal_Int32 i; - for (sal_Int32 i=0; i < memberCount; i++) + for ( i=0; i < memberCount; i++) { xAttr = Reference< XInterfaceAttributeTypeDescription >(memberTypes[i], UNO_QUERY); if ( xAttr.is() ) |