diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-08 13:28:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-08 14:00:39 +0200 |
| commit | afa1779d27da31ef0d5084306db8dc955689a78f (patch) | |
| tree | 2ae08887ffb11dbe5641b2519bd89a51fac3fdf7 /idl | |
| parent | d61b45016ee4048068b8410c5e2635e8d84f9849 (diff) | |
simplify getMangleName()
Change-Id: I811acbbb88d8d9639001d7b9af6b0d4a66a80656
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/inc/slot.hxx | 2 | ||||
| -rw-r--r-- | idl/inc/types.hxx | 1 | ||||
| -rw-r--r-- | idl/source/objects/slot.cxx | 13 | ||||
| -rw-r--r-- | idl/source/objects/types.cxx | 5 |
4 files changed, 6 insertions, 15 deletions
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index a73a3b8ff412..9e5296e1b826 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -65,6 +65,7 @@ class SvMetaSlot : public SvMetaAttribute SvIdlDataBase & rBase, SvStream & rOutStm ); void SetEnumValue(SvMetaEnumValue *p) { pEnumValue = p; } + OString GetMangleName() const; protected: void SetToggle( bool bSet ) { aToggle = bSet; } void SetAutoUpdate( bool bSet ) { aAutoUpdate = bSet; } @@ -98,7 +99,6 @@ public: virtual bool IsVariable() const override; virtual bool IsMethod() const override; - virtual OString GetMangleName( bool bVariable ) const override; SvMetaAttribute * GetMethod() const; SvMetaType * GetSlotType() const; diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 142a211001e9..16ab9dbd43ea 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -48,7 +48,6 @@ public: virtual bool IsMethod() const; virtual bool IsVariable() const; - virtual OString GetMangleName( bool bVariable ) const; virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) override; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 500715c06b0f..6c767edfb57b 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -93,14 +93,11 @@ bool SvMetaSlot::IsMethod() const return b; } -OString SvMetaSlot::GetMangleName( bool bVariable ) const +OString SvMetaSlot::GetMangleName() const { - if( !bVariable ) - { - SvMetaAttribute * pMeth = GetMethod(); - if( pMeth ) - return pMeth->GetName(); - } + SvMetaAttribute * pMeth = GetMethod(); + if( pMeth ) + return pMeth->GetName(); return GetName(); } @@ -871,7 +868,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, { rOutStm.WriteCharPtr( ",\"" ); - rOutStm.WriteCharPtr( GetMangleName( false ).getStr() ); + rOutStm.WriteCharPtr( GetMangleName().getStr() ); rOutStm.WriteCharPtr( "\"" ); } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 4707344347d9..214403161ba0 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -63,11 +63,6 @@ bool SvMetaAttribute::IsVariable() const return pType->GetType() != MetaTypeType::Method; } -OString SvMetaAttribute::GetMangleName( bool ) const -{ - return GetName(); -} - bool SvMetaAttribute::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { |