move isMethod/isVariable down from SvMetaAttribute to SvMetaSlot

Change-Id: Ic13c61d6bd75d12e9dc5c75eaa75573dcb3b3b0b

4 files changed, 6 insertions, 22 deletions

diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 9e5296e1b826..8c838ad02633 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -66,6 +66,9 @@ class SvMetaSlot : public SvMetaAttribute
 
     void            SetEnumValue(SvMetaEnumValue *p) { pEnumValue = p; }
     OString         GetMangleName() const;
+    bool            IsVariable() const;
+    bool            IsMethod() const;
+
 protected:
     void    SetToggle( bool bSet ) { aToggle = bSet; }
     void    SetAutoUpdate( bool bSet ) { aAutoUpdate = bSet; }
@@ -97,9 +100,6 @@ public:
             SvMetaSlot();
             SvMetaSlot( SvMetaType * pType );
 
-    virtual bool        IsVariable() const override;
-    virtual bool        IsMethod() const override;
-
     SvMetaAttribute *   GetMethod() const;
     SvMetaType *        GetSlotType() const;
     const OString&      GetGroupId() const;
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 16ab9dbd43ea..09c8a7cd4135 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -46,10 +46,6 @@ public:
     const SvIdentifier& GetSlotId() const;
     SvMetaType *        GetType() const;
 
-    virtual bool        IsMethod() const;
-    virtual bool        IsVariable() const;
-
-
     virtual bool        Test( SvIdlDataBase &, SvTokenStream & rInStm ) override;
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
     sal_uLong           MakeSfx( OStringBuffer& rAtrrArray );
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 6c767edfb57b..cb8ce8229fc7 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -83,12 +83,13 @@ bool SvMetaSlot::GetHidden() const
 
 bool SvMetaSlot::IsVariable() const
 {
-    return SvMetaAttribute::IsVariable();
+    SvMetaType * pType = GetType();
+    return pType->GetType() != MetaTypeType::Method;
 }
 
 bool SvMetaSlot::IsMethod() const
 {
-    bool b = SvMetaAttribute::IsMethod();
+    bool b = GetType()->GetType() == MetaTypeType::Method;
     b |= nullptr != GetMethod();
     return b;
 }
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 214403161ba0..d4eaf659f234 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -50,19 +50,6 @@ const SvIdentifier & SvMetaAttribute::GetSlotId() const
     return static_cast<SvMetaAttribute *>(GetRef())->GetSlotId();
 }
 
-bool SvMetaAttribute::IsMethod() const
-{
-    SvMetaType * pType = GetType();
-    DBG_ASSERT( pType, "no type for attribute" );
-    return pType->GetType() == MetaTypeType::Method;
-}
-
-bool SvMetaAttribute::IsVariable() const
-{
-    SvMetaType * pType = GetType();
-    return pType->GetType() != MetaTypeType::Method;
-}
-
 bool SvMetaAttribute::Test( SvIdlDataBase & rBase,
                             SvTokenStream & rInStm )
 {