mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this is never NULL, can be a reference

Browse Source
This commit is contained in:
Caolán McNamara
2011-09-20 23:27:06 +01:00
parent 0577f19870
commit 3eb62d6899
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
idl/inc/types.hxx
View File

@@ -116,7 +116,7 @@ public:
WriteType, WriteAttribute ); WriteType, WriteAttribute );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 ); WriteType, WriteAttribute = 0 );
sal_uLong MakeSfx( ByteString * pAtrrArray ); sal_uLong MakeSfx( ByteString& rAtrrArray );
virtual void Insert( SvSlotElementList&, const ByteString & rPrefix, virtual void Insert( SvSlotElementList&, const ByteString & rPrefix,
SvIdlDataBase& ); SvIdlDataBase& );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -238,7 +238,7 @@ public:
void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
void AppendParserString (ByteString &rString); void AppendParserString (ByteString &rString);
sal_uLong MakeSfx( ByteString * pAtrrArray ); sal_uLong MakeSfx( ByteString& rAtrrArray );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
sal_Bool ReadMethodArgs( SvIdlDataBase & rBase, sal_Bool ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm ); SvTokenStream & rInStm );

22
idl/source/objects/types.cxx
View File

@@ -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(); SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" ); DBG_ASSERT( pType, "no type for attribute" );
SvMetaType * pBaseType = pType->GetBaseType(); SvMetaType * pBaseType = pType->GetBaseType();
DBG_ASSERT( pBaseType, "no base type for attribute" ); DBG_ASSERT( pBaseType, "no base type for attribute" );
if( pBaseType->GetType() == TYPE_STRUCT ) if( pBaseType->GetType() == TYPE_STRUCT )
return pBaseType->MakeSfx( pAttrArray ); return pBaseType->MakeSfx( rAttrArray );
else else
{ {
*pAttrArray += '{'; rAttrArray += '{';
*pAttrArray += GetSlotId(); rAttrArray += GetSlotId();
*pAttrArray += ",\""; rAttrArray += ",\"";
*pAttrArray += GetName(); rAttrArray += GetName();
*pAttrArray += "\"}"; rAttrArray += "\"}";
return 1; return 1;
} }
} }
@@ -1399,7 +1399,7 @@ void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA ); SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
} }
sal_uLong SvMetaType::MakeSfx( ByteString * pAttrArray ) sal_uLong SvMetaType::MakeSfx( ByteString& rAttrArray )
{ {
sal_uLong nC = 0; sal_uLong nC = 0;
@@ -1409,9 +1409,9 @@ sal_uLong SvMetaType::MakeSfx( ByteString * pAttrArray )
// write the single attributes // write the single attributes
for( sal_uLong n = 0; n < nAttrCount; n++ ) for( sal_uLong n = 0; n < nAttrCount; n++ )
{ {
nC += pAttrList->GetObject( n )->MakeSfx( pAttrArray ); nC += pAttrList->GetObject( n )->MakeSfx( rAttrArray );
if( n +1 < nAttrCount ) if( n +1 < nAttrCount )
*pAttrArray += ", "; rAttrArray += ", ";
} }
} }
return nC; return nC;
@@ -1427,7 +1427,7 @@ void SvMetaType::WriteSfxItem(
ByteString aTypeName = "SfxType"; ByteString aTypeName = "SfxType";
ByteString aAttrArray; ByteString aAttrArray;
sal_uLong nAttrCount = MakeSfx( &aAttrArray ); sal_uLong nAttrCount = MakeSfx( aAttrArray );
ByteString aAttrCount( ByteString aAttrCount(
rtl::OString::valueOf(static_cast<sal_Int32>(nAttrCount))); rtl::OString::valueOf(static_cast<sal_Int32>(nAttrCount)));
aTypeName += aAttrCount; aTypeName += aAttrCount;