diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-21 15:46:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-22 07:29:17 +0200 |
| commit | 3ddae219e4be882704ffd917e80c1d8b22c5d48b (patch) | |
| tree | 1193b8001ffe9f755b12bd2e1f017a402fd710c6 /idl | |
| parent | 764e3016b62665281539af4e990ca4ff0445c26c (diff) | |
remove unused fields pName and pMethodName in SfxSlot class
Change-Id: Icca5a0dee296fae1abeb78ea8ffa2f9e934bb111
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/inc/slot.hxx | 4 | ||||
| -rw-r--r-- | idl/source/objects/object.cxx | 2 | ||||
| -rw-r--r-- | idl/source/objects/slot.cxx | 23 |
3 files changed, 6 insertions, 23 deletions
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 220c47866829..65ede6d3f969 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -72,8 +72,7 @@ class SvMetaSlot : public SvMetaAttribute sal_uInt16 nCount, const OString& rSlotId, SvSlotElementList &rList, size_t nStart, - const OString& rPrefix, - SvIdlDataBase & rBase, SvStream & rOutStm ); + SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; @@ -244,7 +243,6 @@ public: sal_uInt16 nCount, SvSlotElementList&, size_t nStart, - const OString&, SvIdlDataBase & rBase, SvStream & rOutStm ); sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase, diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index fa3224f5dfc8..6609031e4b62 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -452,7 +452,7 @@ sal_uInt16 SvMetaClass::WriteSlots( const OString& rShellName, SvSlotElement * pEle = rSlotList[ i ]; SvMetaSlot * pAttr = pEle->xSlot; nSCount = nSCount + pAttr->WriteSlotMap( rShellName, nCount + nSCount, - rSlotList, i, pEle->aPrefix, rBase, + rSlotList, i, rBase, rOutStm ); } diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 6b8440119840..755bd9a5e255 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -1145,7 +1145,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, const OString& rSlotId, SvSlotElementList& rSlotList, size_t nStart, - const OString& rPrefix, SvIdlDataBase & rBase, SvStream & rOutStm ) { if ( !GetExport() && !GetHidden() ) @@ -1379,25 +1378,12 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, sal_uLong nSCount = pType->GetAttrCount(); rOutStm .WriteCharPtr( OString::number(nSCount).getStr() ) - .WriteCharPtr( "/*Count*/" ); + .WriteCharPtr( "/*Count*/," ); } else - rOutStm.WriteChar( '0' ); + rOutStm.WriteCharPtr( "0," ); - // name for recording - if ( GetExport() ) - { - rOutStm.WriteCharPtr( ",\"" ); - if (!rPrefix.isEmpty()) - rOutStm.WriteCharPtr( rPrefix.getStr() ); - rOutStm.WriteChar( '.' ); - if ( !IsVariable() || !GetType() || - GetType()->GetBaseType()->GetType() != TYPE_STRUCT ) - rOutStm.WriteCharPtr( GetMangleName( false ).getStr() ); - rOutStm.WriteCharPtr( "\"," ); - } - else - rOutStm.WriteCharPtr( ", 0, " ); + rOutStm.WriteCharPtr( " " ); // Method/Property flags if( IsMethod() ) @@ -1463,7 +1449,6 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO sal_uInt16 SvMetaSlot::WriteSlotMap( const OString& rShellName, sal_uInt16 nCount, SvSlotElementList& rSlotList, size_t nStart, - const OString& rPrefix, SvIdlDataBase & rBase, SvStream & rOutStm ) { @@ -1483,7 +1468,7 @@ sal_uInt16 SvMetaSlot::WriteSlotMap( const OString& rShellName, sal_uInt16 nCoun nSCount = (sal_uInt16)pType->GetAttrCount(); } - WriteSlot( rShellName, nCount, slotId, rSlotList, nStart, rPrefix, rBase, rOutStm ); + WriteSlot( rShellName, nCount, slotId, rSlotList, nStart, rBase, rOutStm ); return nSCount; } |