diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-27 14:11:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-28 08:25:18 +0000 |
| commit | 7097037d5a20d2cad5a5e4b10f8f9d5aaf37589f (patch) | |
| tree | f71ef6bde8c695261649b04ad8bceaa0cc08a897 /include | |
| parent | 71403558cbffb6c1ce1c4993a177bf3364941e22 (diff) | |
remove enum slot code from sfx2
since we only used it for the pseudo-slot stuff, which is now gone
Change-Id: I72146090e7741d5b71d581fa0b5c6d43c154445a
Reviewed-on: https://gerrit.libreoffice.org/35759
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/bindings.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/msg.hxx | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index c39d075f6398..e8c95998b826 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -111,8 +111,7 @@ private: SfxFoundCacheArr_Impl& ); SAL_DLLPRIVATE std::size_t GetSlotPos( sal_uInt16 nId, std::size_t nStartSearchAt = 0 ); SAL_DLLPRIVATE void Update_Impl( SfxStateCache* pCache ); - SAL_DLLPRIVATE void UpdateControllers_Impl( - const SfxInterface* pIF, + static SAL_DLLPRIVATE void UpdateControllers_Impl( const SfxFoundCache_Impl& rFound, const SfxPoolItem *pItem, SfxItemState eItemState ); diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index d0985c07d522..d16f6b4dd0a7 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -85,7 +85,6 @@ namespace o3tl enum class SfxSlotKind { Standard, - Enum, Attribute }; @@ -155,7 +154,7 @@ SFX_DECL_TYPE(23); // for SvxSearchItem ExecMethodPtr, \ StateMethodPtr, \ (const SfxType*) &a##ItemClass##_Impl, \ - 0, 0, \ + 0, \ &a##aShellClass##Args_Impl[nArg0], nArgs, SfxDisableFlags::NONE, Name \ } @@ -165,16 +164,16 @@ SFX_DECL_TYPE(23); // for SvxSearchItem ExecMethodPtr, \ StateMethodPtr, \ (const SfxType*) &a##ItemClass##_Impl, \ - 0, 0, 0, 0, 0 \ + 0, 0, 0, 0 \ } -#define SFX_NEW_SLOT_ARG( aShellClass, id, GroupId, pLinked, pNext, ExecMethodPtr, StateMethodPtr, Flags, DisableFlags, ItemClass, nArg0, nArgs, Prop, UnoName ) \ +#define SFX_NEW_SLOT_ARG( aShellClass, id, GroupId, pNext, ExecMethodPtr, StateMethodPtr, Flags, DisableFlags, ItemClass, nArg0, nArgs, Prop, UnoName ) \ { id, GroupId, Flags | Prop, \ USHRT_MAX, 0, \ ExecMethodPtr, \ StateMethodPtr, \ (const SfxType*) &a##ItemClass##_Impl, \ - pLinked, pNext, \ + pNext, \ &a##aShellClass##Args_Impl[nArg0], nArgs, DisableFlags, UnoName \ } @@ -204,7 +203,6 @@ public: const SfxType* pType; // SfxPoolItem-Type (Status) - const SfxSlot* pLinkedSlot; // Master-Slot for Enum value const SfxSlot* pNextSlot; // with the same Status-Method const SfxFormalArgument* pFirstArgDef; // first formal Argument-Definition @@ -236,7 +234,6 @@ public: SfxExecFunc GetExecFnc() const { return fnExec; } SfxStateFunc GetStateFnc() const { return fnState; } - const SfxSlot* GetLinkedSlot() const { return pLinkedSlot; } const SfxSlot* GetNextSlot() const { return pNextSlot; } }; |