diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-20 23:27:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-21 09:47:38 +0100 |
| commit | 3eb62d6899534023fac60b1aa57dce337aa94cf9 (patch) | |
| tree | f276a7f42c9062b9a62689c2ef9982cb83542240 /idl | |
| parent | 0577f19870453e7bc707b59d57c5331df7bde14d (diff) | |
this is never NULL, can be a reference
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/inc/types.hxx | 4 | ||||
| -rw-r--r-- | idl/source/objects/types.cxx | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index b6bdfdbc5779..a40cc68c6ff8 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -116,7 +116,7 @@ public: WriteType, WriteAttribute ); virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0 ); - sal_uLong MakeSfx( ByteString * pAtrrArray ); + sal_uLong MakeSfx( ByteString& rAtrrArray ); virtual void Insert( SvSlotElementList&, const ByteString & rPrefix, SvIdlDataBase& ); virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, @@ -238,7 +238,7 @@ public: void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); void AppendParserString (ByteString &rString); - sal_uLong MakeSfx( ByteString * pAtrrArray ); + sal_uLong MakeSfx( ByteString& rAtrrArray ); virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); sal_Bool ReadMethodArgs( SvIdlDataBase & rBase, SvTokenStream & rInStm ); diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index d027e8610391..a32bff132fb7 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -722,21 +722,21 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, } } -sal_uLong SvMetaAttribute::MakeSfx( ByteString * pAttrArray ) +sal_uLong SvMetaAttribute::MakeSfx( ByteString& rAttrArray ) { SvMetaType * pType = GetType(); DBG_ASSERT( pType, "no type for attribute" ); SvMetaType * pBaseType = pType->GetBaseType(); DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_STRUCT ) - return pBaseType->MakeSfx( pAttrArray ); + return pBaseType->MakeSfx( rAttrArray ); else { - *pAttrArray += '{'; - *pAttrArray += GetSlotId(); - *pAttrArray += ",\""; - *pAttrArray += GetName(); - *pAttrArray += "\"}"; + rAttrArray += '{'; + rAttrArray += GetSlotId(); + rAttrArray += ",\""; + rAttrArray += GetName(); + rAttrArray += "\"}"; return 1; } } @@ -1399,7 +1399,7 @@ void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA ); } -sal_uLong SvMetaType::MakeSfx( ByteString * pAttrArray ) +sal_uLong SvMetaType::MakeSfx( ByteString& rAttrArray ) { sal_uLong nC = 0; @@ -1409,9 +1409,9 @@ sal_uLong SvMetaType::MakeSfx( ByteString * pAttrArray ) // write the single attributes for( sal_uLong n = 0; n < nAttrCount; n++ ) { - nC += pAttrList->GetObject( n )->MakeSfx( pAttrArray ); + nC += pAttrList->GetObject( n )->MakeSfx( rAttrArray ); if( n +1 < nAttrCount ) - *pAttrArray += ", "; + rAttrArray += ", "; } } return nC; @@ -1427,7 +1427,7 @@ void SvMetaType::WriteSfxItem( ByteString aTypeName = "SfxType"; ByteString aAttrArray; - sal_uLong nAttrCount = MakeSfx( &aAttrArray ); + sal_uLong nAttrCount = MakeSfx( aAttrArray ); ByteString aAttrCount( rtl::OString::valueOf(static_cast<sal_Int32>(nAttrCount))); aTypeName += aAttrCount; |