diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 11:00:19 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:49:26 +0200 |
| commit | 62256ea10a5b7d2b554902780fbb3be12a8d07b3 (patch) | |
| tree | 686354bc82c309ed9227ec9e1ab9116b39d8f36b /idl | |
| parent | 6b1f81267882d3a5f48ccc12426e8df1af3eff06 (diff) | |
svidl: Unwind SFX_ARGUMENT macro, and kill it.
Change-Id: I61334b687c251ccc90f125e8bf95f8689028b8c3
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/source/objects/object.cxx | 2 | ||||
| -rw-r--r-- | idl/source/objects/slot.cxx | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index dbf5a81996ec..635bf62d0c6f 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -597,7 +597,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) { // at leaast one dummy WriteTab( rOutStm, 1 ); - rOutStm.WriteCharPtr( "SFX_ARGUMENT( 0, 0, SfxVoidItem )" ) << endl; + rOutStm.WriteCharPtr("{ (const SfxType*) &aSfxVoidItem_Impl, 0, 0 }" ) << endl; } rOutStm << endl; rOutStm.WriteCharPtr( "};" ) << endl << endl; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 7867f1812f0f..21ae92287924 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -1445,12 +1445,13 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO SvMetaAttribute * pPar = rList[n]; SvMetaType * pPType = pPar->GetType(); WriteTab( rOutStm, 1 ); - rOutStm.WriteCharPtr( "SFX_ARGUMENT(" ) - .WriteCharPtr( pPar->GetSlotId().getString().getStr() ).WriteChar( ',' ) // SlodId + rOutStm.WriteCharPtr("{ (const SfxType*) &a") + // item type + .WriteCharPtr(pPType->GetName().getString().getStr()).WriteCharPtr("_Impl, ") // parameter name - .WriteCharPtr( "\"" ).WriteCharPtr( pPar->GetName().getString().getStr() ).WriteCharPtr( "\"," ) - // item name - .WriteCharPtr( pPType->GetName().getString().getStr() ).WriteCharPtr( ")," ) << endl; + .WriteCharPtr("\"").WriteCharPtr(pPar->GetName().getString().getStr()).WriteCharPtr("\", ") + // slot id + .WriteCharPtr(pPar->GetSlotId().getString().getStr()).WriteCharPtr(" },") << endl; if( !rBase.FindType( pPType, rBase.aUsedTypes ) ) rBase.aUsedTypes.push_back( pPType ); } |