remove PseudoSlot support from idl compiler

Since we have removed the last usage with
commit 12c6caa8
"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/35754Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

bin/list-dispatch-commands.php

@@ -48,11 +48,10 @@ function analyseFile($fileName) {
             $slotId = trim($tmp[1]);
             $index++;
             $aLine = $lines[$index];
-            $isEnumSlot = strpos($aLine, 'SFX_NEW_SLOT_ENUM') !== FALSE;
             $tmp = explode(',', $aLine);
             $slotRID = $tmp[1];
 
-            $index += $isEnumSlot ? 4 : 3;
+            $index += 3;
             $aLine = $lines[$index];
             $mode = "";
             addMode($mode, $aLine, "CACHABLE",      "C");
@@ -60,7 +59,7 @@ function analyseFile($fileName) {
             addMode($mode, $aLine, "MENUCONFIG",    "M");
             addMode($mode, $aLine, "TOOLBOXCONFIG", "T");
             addMode($mode, $aLine, "ACCELCONFIG",   "A");
-            $index += $isEnumSlot ? 1 : 3;
+            $index += 3;
             $aLine = $lines[$index];
             if (strpos($aLine, '"') === FALSE) {
                 $index++;

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)

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 );

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 };

idl/source/objects/object.cxx

@@ -192,7 +192,7 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>&
             // Write only if not already written by subclass or
             // imported interface.
             rSuperList.push_back(nId);
-            pAttr->Insert(rList, rPrefix, rBase);
+            pAttr->Insert(rList);
         }
     }
 

idl/source/objects/types.cxx

@@ -115,7 +115,7 @@ sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray )
     }
 }
 
-void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase&)
+void SvMetaAttribute::Insert(SvSlotElementList&)
 {
 }
 

idl/source/prj/command.cxx

@@ -83,8 +83,6 @@ char const * const SyntaxStrings[] = {
 "\t\tFastCall",
 "\t\tGet, Set",
 "\t\tGroupId        = Identifier",
-"\t\tPseudoPrefix   = Identifier",
-"\t\tPseudoSlots",
 "\t\tReadOnlyDoc*",
 "\t\tRecordPerSet*, RecordPerItem, NoRecord",
 "\t\tRecordAbsolute",

idl/source/prj/globals.cxx

@@ -74,7 +74,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(float)
     A_ENTRY(double)
     A_ENTRY(item)
-    A_ENTRY(PseudoSlots)
     A_ENTRY(import)
     A_ENTRY(SlotIdFile)
     A_ENTRY(include)
@@ -82,7 +81,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(StateMethod)
     A_ENTRY(GroupId)
     A_ENTRY(Export)
-    A_ENTRY(PseudoPrefix)
     A_ENTRY(define)
     A_ENTRY(MenuConfig)
     A_ENTRY(ToolBoxConfig)

idl/source/prj/parser.cxx

@@ -382,7 +382,6 @@ bool SvIdlParser::ReadSlot(SvMetaSlot& rSlot)
 void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot )
 {
     bool bOk = false;
-    bOk |= ReadIfBoolAttribute(rSlot.aPseudoSlots, SvHash_PseudoSlots() );
     bOk |= ReadIfIdAttribute(rSlot.aGroupId, SvHash_GroupId() );
     bOk |= ReadIfIdAttribute(rSlot.aExecMethod, SvHash_ExecMethod() );
     bOk |= ReadIfIdAttribute(rSlot.aStateMethod, SvHash_StateMethod() );
@@ -417,7 +416,6 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot )
         bOk = true;
     }
 
-    bOk |= ReadIfIdAttribute(rSlot.aPseudoPrefix, SvHash_PseudoPrefix() );
     bOk |= ReadIfBoolAttribute(rSlot.aMenuConfig, SvHash_MenuConfig() );
     bOk |= ReadIfBoolAttribute(rSlot.aToolBoxConfig, SvHash_ToolBoxConfig() );
     bOk |= ReadIfBoolAttribute(rSlot.aAccelConfig, SvHash_AccelConfig() );

include/sfx2/msg.hxx

@@ -178,17 +178,6 @@ SFX_DECL_TYPE(23); // for SvxSearchItem
                  &a##aShellClass##Args_Impl[nArg0], nArgs, DisableFlags, UnoName \
                }
 
-#define SFX_NEW_SLOT_ENUM( SlaveId, GroupId, pMaster, pNext, MasterId, Value, Flags, DisableFlags, UnoName  ) \
-               { SlaveId, GroupId, Flags,   \
-                 MasterId,  Value, \
-                 0, \
-                 0, \
-                 (const SfxType*) &aSfxBoolItem_Impl, \
-                 pMaster, \
-                 pNext, \
-                 0, 0, DisableFlags, UnoName \
-               }
-
 struct SfxFormalArgument
 {
     const SfxType*  pType;    // Type of the parameter (SfxPoolItem subclass)