summaryrefslogtreecommitdiff
path: root/idl/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-03-27 13:10:22 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-03-28 08:24:51 +0000
commit71403558cbffb6c1ce1c4993a177bf3364941e22 (patch)
tree76aeee13c28f3c4177d5e3f5c9348d6b88f3abc4 /idl/inc
parentdad9627997f4e4d37d31c36b4125e572406af0f2 (diff)
remove PseudoSlot support from idl compiler
Since we have removed the last usage with commit 12c6caa84a61f23df996a0396432fa4b8d5c4785 "Kill remaining PseudoSlots usage" And remove corresponding support from the list-dispatch-commands script. Also remove the now unused SFX_NEW_SLOT_ENUM macro Change-Id: Id07c431de4404acf61a8bdd3507e390e5249879a Reviewed-on: https://gerrit.libreoffice.org/35754 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idl/inc')
-rw-r--r--idl/inc/globals.hxx4
-rw-r--r--idl/inc/slot.hxx12
-rw-r--r--idl/inc/types.hxx3
3 files changed, 3 insertions, 16 deletions
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index d4274246064a..964176cfcce6 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -44,7 +44,6 @@ struct SvGlobalHashNames
SvStringHashEntry* MM_float;
SvStringHashEntry* MM_double;
SvStringHashEntry* MM_item;
- SvStringHashEntry* MM_PseudoSlots;
SvStringHashEntry* MM_import;
SvStringHashEntry* MM_SlotIdFile;
SvStringHashEntry* MM_include;
@@ -52,7 +51,6 @@ struct SvGlobalHashNames
SvStringHashEntry* MM_StateMethod;
SvStringHashEntry* MM_GroupId;
SvStringHashEntry* MM_Export;
- SvStringHashEntry* MM_PseudoPrefix;
SvStringHashEntry* MM_define;
SvStringHashEntry* MM_MenuConfig;
SvStringHashEntry* MM_ToolBoxConfig;
@@ -106,7 +104,6 @@ HASH_INLINE(INT32)
HASH_INLINE(BOOL)
HASH_INLINE(BYTE)
HASH_INLINE(item)
-HASH_INLINE(PseudoSlots)
HASH_INLINE(import)
HASH_INLINE(SlotIdFile)
HASH_INLINE(include)
@@ -116,7 +113,6 @@ HASH_INLINE(GroupId)
HASH_INLINE(float)
HASH_INLINE(double)
HASH_INLINE(Export)
-HASH_INLINE(PseudoPrefix)
HASH_INLINE(define)
HASH_INLINE(MenuConfig)
HASH_INLINE(ToolBoxConfig)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 5513009ce3a4..06e98097380f 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -31,7 +31,6 @@ public:
SvIdentifier aGroupId;
SvIdentifier aExecMethod;
SvIdentifier aStateMethod;
- SvBOOL aPseudoSlots;
SvBOOL aToggle;
SvBOOL aAutoUpdate;
@@ -48,12 +47,9 @@ public:
SvBOOL aAccelConfig;
SvBOOL aFastCall;
SvBOOL aContainer;
- SvIdentifier aPseudoPrefix;
OString aDisableFlags;
- SvMetaSlot* pLinkedSlot;
SvMetaSlot* pNextSlot;
sal_uLong nListPos;
- SvMetaEnumValue* pEnumValue;
SvBOOL aReadOnlyDoc;
SvBOOL aExport;
@@ -63,7 +59,6 @@ public:
size_t nStart,
SvIdlDataBase & rBase, SvStream & rOutStm );
- void SetEnumValue(SvMetaEnumValue *p) { pEnumValue = p; }
OString GetMangleName() const;
bool IsVariable() const;
bool IsMethod() const;
@@ -97,7 +92,6 @@ public:
const OString& GetExecMethod() const;
const OString& GetStateMethod() const;
const OString& GetDisableFlags() const;
- bool GetPseudoSlots() const;
bool GetToggle() const;
bool GetAutoUpdate() const;
@@ -108,7 +102,6 @@ public:
bool GetNoRecord() const;
bool GetRecordAbsolute() const;
- const OString& GetPseudoPrefix() const;
bool GetMenuConfig() const;
bool GetToolBoxConfig() const;
bool GetAccelConfig() const;
@@ -123,14 +116,13 @@ public:
void SetListPos(sal_uLong n)
{ nListPos = n; }
void ResetSlotPointer()
- { pNextSlot = pLinkedSlot = nullptr; }
+ { pNextSlot = nullptr; }
virtual bool Test( SvTokenStream & rInStm ) override;
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm ) override;
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
- virtual void Insert( SvSlotElementList&, const OString& rPrefix,
- SvIdlDataBase& ) override;
+ virtual void Insert( SvSlotElementList& ) override;
void WriteSlotStubs( const OString& rShellName,
ByteStringList & rList,
SvStream & rOutStm );
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index bcffc371ef99..01f5c99687af 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -44,8 +44,7 @@ public:
virtual bool Test( SvTokenStream & rInStm ) override;
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
sal_uLong MakeSfx( OStringBuffer& rAtrrArray );
- virtual void Insert( SvSlotElementList&, const OString& rPrefix,
- SvIdlDataBase& );
+ virtual void Insert( SvSlotElementList& );
};
enum MetaTypeType { Method, Struct, Base, Enum, Interface, Shell };