diff options
| author | August Sodora <augsod@gmail.com> | 2012-01-14 01:48:28 -0500 |
|---|---|---|
| committer | August Sodora <augsod@gmail.com> | 2012-01-14 15:13:05 -0500 |
| commit | 440a7c9b92822206db52861dc79d053450004a9f (patch) | |
| tree | 11871ddfa4f37ba7a5e69b58e288cc39669986ff /basic/source/sbx/sbxvar.cxx | |
| parent | 1c0912ab00d5b324c07fc973655a73d1cea9c199 (diff) | |
SV_DECL_PTRARR_DEL->boost::ptr_vector
Diffstat (limited to 'basic/source/sbx/sbxvar.cxx')
| -rw-r--r-- | basic/source/sbx/sbxvar.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 386c8d3473c4..e4ad651532df 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -236,7 +236,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const ((SbxVariable*)this)->GetInfo(); // Append nothing, if it is a simple property (no empty brackets) if( !pInfo - || ( !pInfo->aParams.Count() && GetClass() == SbxCLASS_PROPERTY ) ) + || ( pInfo->aParams.empty() && GetClass() == SbxCLASS_PROPERTY ) ) return maName; xub_Unicode cType = ' '; XubString aTmp( maName ); @@ -250,17 +250,16 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const aTmp += cType; } aTmp += '('; - for( sal_uInt16 i = 0; i < pInfo->aParams.Count(); i++ ) + for(SbxParams::const_iterator i = pInfo->aParams.begin(); i != pInfo->aParams.end(); ++i) { - const SbxParamInfo* q = pInfo->aParams.GetObject( i ); - int nt = q->eType & 0x0FFF; - if( i ) + int nt = i->eType & 0x0FFF; + if( i != pInfo->aParams.begin() ) aTmp += ','; - if( q->nFlags & SBX_OPTIONAL ) + if( i->nFlags & SBX_OPTIONAL ) aTmp += String( SbxRes( STRING_OPTIONAL ) ); - if( q->eType & SbxBYREF ) + if( i->eType & SbxBYREF ) aTmp += String( SbxRes( STRING_BYREF ) ); - aTmp += q->aName; + aTmp += i->aName; cType = ' '; // short type? Then fetch it, posible this is 0. if( t == SbxNAME_SHORT_TYPES ) @@ -271,12 +270,12 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const if( cType != ' ' ) { aTmp += cType; - if( q->eType & SbxARRAY ) + if( i->eType & SbxARRAY ) aTmp.AppendAscii( "()" ); } else { - if( q->eType & SbxARRAY ) + if( i->eType & SbxARRAY ) aTmp.AppendAscii( "()" ); // long type? if( t != SbxNAME_SHORT ) |