WIP: continued replacement Item::IBase, ::ISet stuff

Completely changed SbxItem to new mechanisms, to do
so created Item::Sbx implementation, adapted all usages
of SbxItem and added quirte some mechanisms to do so.
Gloal was to completely run (unchanged) wothout the original
SbxItem - that was achieved and can be seen as proof of concept
and example how to acto in doing so.
Adapted ::StateChanged to include a Item::ItemBase::SharedPtr
to an Item for future compatibility - will/should be completely
changed when transition is done.
Added to SfxItemSet which is still used as transport mechanism
the ability to get on-demands of ::ItemSet and ::SlotSet to have
a source/target for the new Items.
Adapted the IDLC compiler to be able to generate needed new stuff
on demand, together with new SlotItems as alternative to
SfxPoolItems. Currently both in place, the latter can go after
transition. Check for CreateSlotItem.
Needed to add a static ::CreateFromAny with an array of arguments
to keep new ::Item implementations read-only, adapted usages.
Added a new ExecuteList method that uses SlotItems/SlotSets.
Added some I2TM tags which I will use to mark stuff in transit as
a uniquely greppable tag (temporary).

Change-Id: If98d20fc08abe9cd6e186c233f2c90883c5e47d3

145 files changed, 462 insertions, 460 deletions

diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index aa7c7dbca3e3..424678783e18 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -84,7 +84,7 @@ MediaToolBoxControl::~MediaToolBoxControl()
 }
 
 
-void MediaToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+void MediaToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
 
diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx
index c594b8d614ee..af0394d8c3c1 100644
--- a/basctl/source/basicide/IDEComboBox.cxx
+++ b/basctl/source/basicide/IDEComboBox.cxx
@@ -60,7 +60,7 @@ LibBoxControl::LibBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
 {
 }
 
-void LibBoxControl::StateChanged(sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const ::Item::IBase::SharedPtr& /*rSlotItem*/)
+void LibBoxControl::StateChanged(sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const ::Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     LibBox* pBox = static_cast<LibBox*>(GetToolBox().GetItemWindow(GetId()));
 
@@ -337,7 +337,7 @@ LanguageBoxControl::LanguageBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolB
 {
 }
 
-void LanguageBoxControl::StateChanged(sal_uInt16, SfxItemState eState, const SfxPoolItem* pItem, const ::Item::IBase::SharedPtr& /*rSlotItem*/)
+void LanguageBoxControl::StateChanged(sal_uInt16, SfxItemState eState, const SfxPoolItem* pItem, const ::Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if (LanguageBox* pBox = static_cast<LanguageBox*>(GetToolBox().GetItemWindow(GetId())))
     {
diff --git a/basctl/source/basicide/sbxitem.cxx b/basctl/source/basicide/sbxitem.cxx
index 0aa578fbba21..a8e5dc6f9acc 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -49,9 +49,9 @@ namespace Item
         return std::static_pointer_cast<const Sbx>(GetStaticAdmin().Create(new Sbx(&rDocument, aLibName, aName, aMethodName, eType)));
     }
 
-    bool Sbx::operator==(const IBase& rCandidate) const
+    bool Sbx::operator==(const ItemBase& rCandidate) const
     {
-        assert(IBase::operator==(rCandidate));
+        assert(ItemBase::operator==(rCandidate));
         const Sbx& rCand(static_cast<const Sbx&>(rCandidate));
         return (GetDocument() == rCand.GetDocument()
             && GetLibName() == rCand.GetLibName()
diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx
index 766ec3f60db4..392df989ebd3 100644
--- a/basctl/source/inc/IDEComboBox.hxx
+++ b/basctl/source/inc/IDEComboBox.hxx
@@ -60,7 +60,7 @@ public:
      * @param pState --
      */
     virtual void StateChanged(sal_uInt16 nSlotID, SfxItemState eState,
-                              const SfxPoolItem* pState, const ::Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const ::Item::ItemBase::SharedPtr& rSlotItem) override;
     /*!
      * Create combobox of Macro and Dialog Library
      *
@@ -189,7 +189,7 @@ public:
      * @param pState --
      */
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const ::Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const ::Item::ItemBase::SharedPtr& rSlotItem) override;
     /*!
      * Create ComboBox of Language
      *
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index f3178798139a..c8420de9d17e 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -23,7 +23,7 @@
 #include <svl/poolitem.hxx>
 
 // I2TM
-#include <item/base/IBaseStaticHelper.hxx>
+#include <item/base/ItemBaseStaticHelper.hxx>
 // ~I2TM
 
 namespace basctl
@@ -43,7 +43,7 @@ enum ItemType
 namespace Item
 {
     class Sbx;
-    typedef ::Item::IBaseStaticHelper<Sbx, ::Item::IAdministrator_vector> SbxStaticHelper;
+    typedef ::Item::ItemBaseStaticHelper<Sbx, ::Item::IAdministrator_vector> SbxStaticHelper;
 
     class Sbx final : public SbxStaticHelper
     {
@@ -73,7 +73,7 @@ namespace Item
             const OUString& aName = OUString(),
             const OUString& aMethodName = OUString(),
             ItemType eType = TYPE_UNKNOWN);
-        virtual bool operator==(const IBase& rCandidate) const override;
+        virtual bool operator==(const ItemBase& rCandidate) const override;
 
         ScriptDocument const& GetDocument() const { return m_aDocument; }
         OUString const& GetLibName() const { return m_aLibName; }
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index d7cb9f9c411d..331abdc2aed9 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -57,7 +57,7 @@ void SvxHlinkCtrl::dispose()
 }
 
 void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                 const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                 const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if ( eState == SfxItemState::DEFAULT && !pParent->IsDisposed() )
     {
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 906c1be85be3..fb3ec9aad6e3 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -61,7 +61,7 @@ public:
     virtual void dispose() override;
 
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 };
 
 
diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx
index 67464942ade6..f6dfe8943dec 100644
--- a/include/avmedia/mediatoolbox.hxx
+++ b/include/avmedia/mediatoolbox.hxx
@@ -39,7 +39,7 @@ public:
                                 MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX );
                                 virtual ~MediaToolBoxControl() override;
 
-    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override;
 
 private:
diff --git a/include/item/base/IAdministrator.hxx b/include/item/base/ItemAdministrator.hxx
index 4d83ef235614..25830152ca8f 100644
--- a/include/item/base/IAdministrator.hxx
+++ b/include/item/base/ItemAdministrator.hxx
@@ -17,24 +17,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ITEM_BASE_IADMINISTRATOR_HXX
-#define INCLUDED_ITEM_BASE_IADMINISTRATOR_HXX
+#ifndef INCLUDED_ITEM_BASE_ITEMADMINISTRATOR_HXX
+#define INCLUDED_ITEM_BASE_ITEMADMINISTRATOR_HXX
 
 #include <vector>
 #include <set>
 #include <unordered_set>
 #include <cassert>
-#include <item/base/IBase.hxx>
+#include <item/base/ItemBase.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace Item
 {
-    // Base class for IAdministrator. It's Task is to administer instances
-    // of IBase - Items. Target is to always have only one instance
+    // Base class for ItemAdministrator. It's Task is to administer instances
+    // of ItemBase - Items. Target is to always have only one instance
     // of a typed Item in one attributation, e.g. for sal_uInt16 many
     // users may use the instance representing the value '12'.
-    // To do so, IAdministrator has to administer a list of that instances
+    // To do so, ItemAdministrator has to administer a list of that instances
     // as static global typed entity for each type of Item that allows
     // search and removal of typed Items.
     // The instances are by purpose no shared_ptr's of the instances. I have
@@ -58,38 +58,38 @@ namespace Item
     // where to administer the Item's global default. This again is done
     // as shared_ptr to fit nicely to the rest of the mechanism.
     // Note to this default: This is the Item's global, type-specific
-    // default, this may be overriden by ISet and ModelSpecificIValues,
-    // but only in association with an ISet (see there). The Item-specific
+    // default, this may be overriden by ItemSet and ModelSpecificItemValues,
+    // but only in association with an ItemSet (see there). The Item-specific
     // global default will always be the same, so only deviating values
-    // for ModelSpecificIValues need to be overriden.
-    class ITEM_DLLPUBLIC IAdministrator
+    // for ModelSpecificItemValues need to be overriden.
+    class ITEM_DLLPUBLIC ItemAdministrator
     {
     protected:
         // instance of global default value
-        IBase::SharedPtr m_aDefault;
+        ItemBase::SharedPtr m_aDefault;
 
-        void SetAdministrated(const IBase& rIBase) const;
+        void SetAdministrated(const ItemBase& rIBase) const;
 
     public:
         // constructor/destructor
-        IAdministrator(const IBase* pDefault);
-        virtual ~IAdministrator();
+        ItemAdministrator(const ItemBase* pDefault);
+        virtual ~ItemAdministrator();
 
         // noncopyable
-        IAdministrator(const IAdministrator&) = delete;
-        IAdministrator& operator=(const IAdministrator&) = delete;
+        ItemAdministrator(const ItemAdministrator&) = delete;
+        ItemAdministrator& operator=(const ItemAdministrator&) = delete;
 
-        // needed IAdministrator calls from IBase implementations.
+        // needed ItemAdministrator calls from ItemBase implementations.
         // these are the add/remove calls to the list. The Create
         // will check existance/default and either re-use existing
         // instance (and delete given one) or start using given instance
-        virtual void HintExpired(const IBase* pIBase);
-        virtual IBase::SharedPtr Create(const IBase* pIBase) = 0;
+        virtual void HintExpired(const ItemBase* pIBase);
+        virtual ItemBase::SharedPtr Create(const ItemBase* pIBase) = 0;
 
         // interface for global default value support
         // on Administrator level
-        const IBase::SharedPtr& GetDefault() const;
-        bool IsDefault(const IBase* pIBase) const;
+        const ItemBase::SharedPtr& GetDefault() const;
+        bool IsDefault(const ItemBase* pIBase) const;
     };
 } // end of namespace Item
 
@@ -97,32 +97,32 @@ namespace Item
 
 namespace Item
 {
-    // IAdministrator-implementation using std::set for implementation
+    // ItemAdministrator-implementation using std::set for implementation
     // which guarantees good runtime for accesses (sorted list)
-    // requirements from IBase:
-    // - bool IBase::operator<(const IBase& rCand) const
+    // requirements from ItemBase:
+    // - bool ItemBase::operator<(const ItemBase& rCand) const
     // Caution: This does not exist for current SfxItem implementations
-    class ITEM_DLLPUBLIC IAdministrator_set : public IAdministrator
+    class ITEM_DLLPUBLIC IAdministrator_set : public ItemAdministrator
     {
     private:
         struct less_for_set
         {
-            bool operator()(const IBase* pItem1, const IBase* pItem2) const
+            bool operator()(const ItemBase* pItem1, const ItemBase* pItem2) const
             {
-                // forward to IBase::operator<
+                // forward to ItemBase::operator<
                 return pItem1->operator<(*pItem2);
             }
         };
 
         // std::set with all instanciated Items of this type, sorted by
         // operator< (see less_for_set above)
-        std::set<const IBase*, less_for_set> m_aEntries;
+        std::set<const ItemBase*, less_for_set> m_aEntries;
 
     public:
-        IAdministrator_set(const IBase* pDefault);
+        IAdministrator_set(const ItemBase* pDefault);
 
-        virtual IBase::SharedPtr Create(const IBase* pIBase) override;
-        virtual void HintExpired(const IBase* pIBase) override;
+        virtual ItemBase::SharedPtr Create(const ItemBase* pIBase) override;
+        virtual void HintExpired(const ItemBase* pIBase) override;
     };
 } // end of namespace Item
 
@@ -130,42 +130,42 @@ namespace Item
 
 namespace Item
 {
-    // IAdministrator-implementation using std::unordered_set for
+    // ItemAdministrator-implementation using std::unordered_set for
     // implementation which guarantees good runtime for accesses (hashed)
-    // requirements from IBase:
-    // - virtual bool IBase::operator==(const IBase& rCandidate) const
-    // - size_t IBase::GetUniqueKey() const
+    // requirements from ItemBase:
+    // - virtual bool ItemBase::operator==(const ItemBase& rCandidate) const
+    // - size_t ItemBase::GetUniqueKey() const
     // Caution: GetUniqueKey does not exist for current SfxItem implementations
-    class ITEM_DLLPUBLIC IAdministrator_unordered_set : public IAdministrator
+    class ITEM_DLLPUBLIC IAdministrator_unordered_set : public ItemAdministrator
     {
     private:
         struct compare_for_unordered_set
         {
-            bool operator()(const IBase* pItem1, const IBase* pItem2) const
+            bool operator()(const ItemBase* pItem1, const ItemBase* pItem2) const
             {
-                // forward to IBase::operator==
+                // forward to ItemBase::operator==
                 return pItem1->operator==(*pItem2);
             }
         };
 
         struct hash_for_unordered_set
         {
-            size_t operator()(const IBase* pItem) const
+            size_t operator()(const ItemBase* pItem) const
             {
-                // forward to IBase::GetUniqueKey
+                // forward to ItemBase::GetUniqueKey
                 return pItem->GetUniqueKey();
             }
         };
 
         // std::unordered_set with all instanciated Items of this type,
         // using hash and operator== (see hash_for_unordered_set, compare_for_unordered_set above)
-        std::unordered_set<const IBase*, hash_for_unordered_set, compare_for_unordered_set> m_aEntries;
+        std::unordered_set<const ItemBase*, hash_for_unordered_set, compare_for_unordered_set> m_aEntries;
 
     public:
-        IAdministrator_unordered_set(const IBase* pDefault);
+        IAdministrator_unordered_set(const ItemBase* pDefault);
 
-        virtual IBase::SharedPtr Create(const IBase* pIBase) override;
-        virtual void HintExpired(const IBase* pIBase) override;
+        virtual ItemBase::SharedPtr Create(const ItemBase* pIBase) override;
+        virtual void HintExpired(const ItemBase* pIBase) override;
     };
 } // end of namespace Item
 
@@ -173,16 +173,16 @@ namespace Item
 
 namespace Item
 {
-    // IAdministrator-implementation using std::vector for implementation.
+    // ItemAdministrator-implementation using std::vector for implementation.
     // this is slow, but at least uses a 2nd vector to administer the free
     // slots in the 1st list. This is BTW what SfxItemPool does right now,
     // so this is slowest, but guarantees same speed as current implementation.
-    // requirements from IBase:
-    // - virtual bool IBase::operator==(const IBase& rCandidate) const
+    // requirements from ItemBase:
+    // - virtual bool ItemBase::operator==(const ItemBase& rCandidate) const
     // This does exist for current SfxItem implementations, so this is the
     // simple default for all Items that are hard to transfer/change/update,
     // it allows to continue to use the single operator== for administration.
-    class ITEM_DLLPUBLIC IAdministrator_vector : public IAdministrator
+    class ITEM_DLLPUBLIC IAdministrator_vector : public ItemAdministrator
     {
     private:
         // this unsorted list is used when only operator== is available. Thus
@@ -190,23 +190,23 @@ namespace Item
         // not avoidable or in a phase of change (SfxItem's have operator== already).
         // It uses a std::vector to hjold all instances, plus a list of free slots
         // (just indices) for reuse to avoid re-organizing the vector
-        std::vector<const IBase*> m_aEntries;
+        std::vector<const ItemBase*> m_aEntries;
         std::vector<size_t> m_aFreeSlots;
 
-        std::vector<const IBase*>::iterator find(const IBase* pIBase);
-        void insert(const IBase* pIBase);
-        void erase(std::vector<const IBase*>::iterator& rIter);
+        std::vector<const ItemBase*>::iterator find(const ItemBase* pIBase);
+        void insert(const ItemBase* pIBase);
+        void erase(std::vector<const ItemBase*>::iterator& rIter);
 
     public:
-        IAdministrator_vector(const IBase* pDefault);
+        IAdministrator_vector(const ItemBase* pDefault);
 
-        virtual IBase::SharedPtr Create(const IBase* pIBase) override;
-        virtual void HintExpired(const IBase* pIBase) override;
+        virtual ItemBase::SharedPtr Create(const ItemBase* pIBase) override;
+        virtual void HintExpired(const ItemBase* pIBase) override;
     };
 } // end of namespace Item
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // INCLUDED_ITEM_BASE_IADMINISTRATOR_HXX
+#endif // INCLUDED_ITEM_BASE_ITEMADMINISTRATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/item/base/IBase.hxx b/include/item/base/ItemBase.hxx
index af943299f177..d7146d17a91f 100644
--- a/include/item/base/IBase.hxx
+++ b/include/item/base/ItemBase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ITEM_BASE_IBASE_HXX
-#define INCLUDED_ITEM_BASE_IBASE_HXX
+#ifndef INCLUDED_ITEM_BASE_ITEMBASE_HXX
+#define INCLUDED_ITEM_BASE_ITEMBASE_HXX
 
 #include <memory>
 #include <vector>
@@ -30,16 +30,16 @@
 
 namespace Item
 {
-    // predefine IAdministrator - no need to include
-    class IAdministrator;
+    // predefine ItemAdministrator - no need to include
+    class ItemAdministrator;
 
-    // Base class for IBase and thus for all new implementation of
+    // Base class for ItemBase and thus for all new implementation of
     // Items. Items are in general read-only instances. The constructor
     // is protected now so that no one is able to create own instances.
     // The reason for that is that for all Items only a single value-
     // specific instance shall exist at any time, guaranteed by being
-    // administrated by an instance of IAdministrator associated with
-    // each implemented type of IBase Item.
+    // administrated by an instance of ItemAdministrator associated with
+    // each implemented type of ItemBase Item.
     // To construct, use the ::Create methods. These are in general
     // static member functions. These have to use the protected
     // constructor(s) from which also any number may be defined to
@@ -48,7 +48,7 @@ namespace Item
     // as needed at the created instance in any local implementation
     // of a ::Create method.
     // That instance created and filled (value-set) in a ::Create method
-    // will then be handed over to the single static global IAdministrator
+    // will then be handed over to the single static global ItemAdministrator
     // instance of the derived Item-type. That method will decide if
     // to use the given instance or delete it again - if already an instance
     // of that Item exists (or is identical to the global default of
@@ -62,7 +62,7 @@ namespace Item
     // will no longer be set-methods like ::SetAny(Any& aAny) or similar.
     // Instead, implement a ::Create method for this that creates an instance
     // using a/the protected constructor, set all members from the Any (in
-    // this exapmle) and hand over to the IAdministrator. Result will in all
+    // this exapmle) and hand over to the ItemAdministrator. Result will in all
     // cases be a shared_ptr of the Item.
     // Items are no longer identified by any global to-be-somewhere-defined
     // (collision-free, global, incompatible, hard to maintain) ItemID, but
@@ -70,7 +70,7 @@ namespace Item
     // typeid(<ItemType>).hash_code().
     // The efficency the administration can be done highly depends on the
     // type of operators defined at the Item-Implementation, see
-    // comments at IAdministrator and it's three default implementations for
+    // comments at ItemAdministrator and it's three default implementations for
     // details - also discussing speed compared to SfxItem implementations.
     // When implementing an Item, you choose one of these three
     // predefined implementations to use for the Item-type, based on the
@@ -80,15 +80,15 @@ namespace Item
     // Note: Be aware that some static local functions will be needed for
     // any Item-implementation. To support this and full typed accesses
     // to implemented Items, check out the implementation helper template
-    // class 'IBaseStaticHelper' which should be used to implement Items.
-    // This Base-Class IBase exists as minimal achor point, it sometimes
+    // class 'ItemBaseStaticHelper' which should be used to implement Items.
+    // This Base-Class ItemBase exists as minimal achor point, it sometimes
     // is useful, see e.g. helper classes ImplInvalidateItem and
-    // ImplDisableItem used in ::Iset to represent ItemStates in ISet's.
-    class ITEM_DLLPUBLIC IBase : public std::enable_shared_from_this<IBase>
+    // ImplDisableItem used in ::Iset to represent ItemStates in ItemSet's.
+    class ITEM_DLLPUBLIC ItemBase : public std::enable_shared_from_this<ItemBase>
     {
     public:
         // SharedPtr typedef to be used handling instances of this type
-        typedef std::shared_ptr<const IBase> SharedPtr;
+        typedef std::shared_ptr<const ItemBase> SharedPtr;
 
         // typedefs for PutValues/PutValue/CreateFromAny functionality
         // used from the SfxSlot mechanism (see CreateSlotItem)
@@ -97,53 +97,53 @@ namespace Item
 
     private:
         // flag to mark this instance being administared by an
-        // IAdministrator. Not urgently needed due to also being
+        // ItemAdministrator. Not urgently needed due to also being
         // able to check being administarted in the HintExpired
         // calls. But that is the point - when using this flag
         // at adding the instance and thus making it being actively
         // administrated it is not necessary to do that check
         // if it is administrated which means a 'find' access
         // to a kind of list which may have varying costs...
-        friend class IAdministrator;
+        friend class ItemAdministrator;
         bool        m_bAdministrated;
 
     protected:
         // constructor - protected BY DEFAULT - do NOT CHANGE (!)
         // Use ::Create(...) methods in derived classes instead
-        IBase();
+        ItemBase();
 
         // basic RTTI TypeCheck to secure e.g. operator== and similar
-        bool CheckSameType(const IBase& rCmp) const;
+        bool CheckSameType(const ItemBase& rCmp) const;
 
         // basic access to Adminiatrator, default returns nullptr and is *not*
         // designed to be used/called, only exists to have simple Item
         // representations for special purposes, e.g. InvalidateItem/DisableItem
-        virtual IAdministrator* GetIAdministrator() const;
+        virtual ItemAdministrator* GetIAdministrator() const;
 
         void PutValues(const AnyIDArgs& rArgs);
         virtual void PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId);
 
     public:
-        virtual ~IBase();
+        virtual ~ItemBase();
 
         // noncopyable
-        IBase(const IBase&) = delete;
-        IBase& operator=(const IBase&) = delete;
+        ItemBase(const ItemBase&) = delete;
+        ItemBase& operator=(const ItemBase&) = delete;
 
-        // operators potentially used by IAdministrator implementations, so have to be defined
-        virtual bool operator==(const IBase& rCmp) const;
-        virtual bool operator<(const IBase& rCmp) const;
+        // operators potentially used by ItemAdministrator implementations, so have to be defined
+        virtual bool operator==(const ItemBase& rCmp) const;
+        virtual bool operator<(const ItemBase& rCmp) const;
         virtual size_t GetUniqueKey() const;
 
         // Interface for global default value support. These non-static and
         // non-virtual non-typed local versions can/may work more direct. The
-        // typed static versions are not capable of working with 'const IBase::SharedPtr&'
+        // typed static versions are not capable of working with 'const ItemBase::SharedPtr&'
         // due to using std::static_pointer_cast, thus these may be faster and
         // use less ressources when the type is not needed.
         // These will use the callback to static administrator and it's administrated
         // single global default instance.
         // Remember that there *will* also be static, typed versions of this call
-        // in derived Item(s), see IBaseStaticHelper for reference
+        // in derived Item(s), see ItemBaseStaticHelper for reference
         bool IsDefault() const;
         const SharedPtr& GetDefault() const;
 
@@ -157,6 +157,6 @@ namespace Item
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // INCLUDED_ITEM_BASE_IBASE_HXX
+#endif // INCLUDED_ITEM_BASE_ITEMBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/item/base/IBaseStaticHelper.hxx b/include/item/base/ItemBaseStaticHelper.hxx
index 5fc83362ccb3..3bcd556f9b59 100644
--- a/include/item/base/IBaseStaticHelper.hxx
+++ b/include/item/base/ItemBaseStaticHelper.hxx
@@ -17,44 +17,44 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ITEM_BASE_IBASESTATICHELPER_HXX
-#define INCLUDED_ITEM_BASE_IBASESTATICHELPER_HXX
+#ifndef INCLUDED_ITEM_BASE_ITEMBASESTATICHELPER_HXX
+#define INCLUDED_ITEM_BASE_ITEMBASESTATICHELPER_HXX
 
-#include <item/base/IBase.hxx>
-#include <item/base/IAdministrator.hxx>
+#include <item/base/ItemBase.hxx>
+#include <item/base/ItemAdministrator.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace Item
 {
-    // Template class which supports Item implementations using IBase.
+    // Template class which supports Item implementations using ItemBase.
     // It allows automatic creation of default static methods. To keep
-    // things simple, it directly derives from ::IBase already.
+    // things simple, it directly derives from ::ItemBase already.
     // It provides implementation of all static typed stuff needed to
-    // implement and make available the single global static IAdministrator
+    // implement and make available the single global static ItemAdministrator
     // which will be used for the implementation of that new Item-type.
     // Usually one of three predefined/preimplemented IAdministrators
-    // will be used, for details see IAdministrator.hxx and
+    // will be used, for details see ItemAdministrator.hxx and
     // - IAdministrator_set
     // - IAdministrator_unordered_set
     // - IAdministrator_vector
     // and the explanations/preconditions for their usage.
     // It also defines a convenient SharedPtr type for access for each derived type
     // of Item.
-    template< class TargetType, typename AdminType > class IBaseStaticHelper : public IBase
+    template< class TargetType, typename AdminType > class ItemBaseStaticHelper : public ItemBase
     {
     public:
         // SharedPtr typedef to be used handling instances of given type
         typedef std::shared_ptr<const TargetType> SharedPtr;
 
     protected:
-        static IAdministrator& GetStaticAdmin()
+        static ItemAdministrator& GetStaticAdmin()
         {
             static AdminType aAdmin(new TargetType());
             return aAdmin;
         }
 
-        virtual IAdministrator* GetIAdministrator() const override
+        virtual ItemAdministrator* GetIAdministrator() const override
         {
             return &GetStaticAdmin();
         }
@@ -69,7 +69,7 @@ namespace Item
         // to be very aware what he is doing - to avoid confusion, I
         // decided to *not* offer this currently.
         //
-        // static const IBase::SharedPtr& getStaticDefault()
+        // static const ItemBase::SharedPtr& getStaticDefault()
         // {
         //     return std::static_pointer_cast<const TargetType>(GetStaticAdmin().GetDefault());
         // }
@@ -95,6 +95,6 @@ namespace Item
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // INCLUDED_ITEM_BASE_IBASESTATICHELPER_HXX
+#endif // INCLUDED_ITEM_BASE_ITEMBASESTATICHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/item/base/ISet.hxx b/include/item/base/ItemSet.hxx
index c1562225b3e1..f4aad2d720e6 100644
--- a/include/item/base/ISet.hxx
+++ b/include/item/base/ItemSet.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ITEM_BASE_ISET_HXX
-#define INCLUDED_ITEM_BASE_ISET_HXX
+#ifndef INCLUDED_ITEM_BASE_ITEMSET_HXX
+#define INCLUDED_ITEM_BASE_ITEMSET_HXX
 
-#include <item/base/ModelSpecificIValues.hxx>
+#include <item/base/ModelSpecificItemValues.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -90,13 +90,13 @@
 
 namespace Item
 {
-    class ITEM_DLLPUBLIC ISet : public std::enable_shared_from_this<ISet>
+    class ITEM_DLLPUBLIC ItemSet : public std::enable_shared_from_this<ItemSet>
     {
     public:
         // SharedPtr typedef to be used handling instances of this type
-        typedef std::shared_ptr<ISet> SharedPtr;
+        typedef std::shared_ptr<ItemSet> SharedPtr;
 
-        // The states that an Item (IBase) can have in an ISet
+        // The states that an Item (ItemBase) can have in an ItemSet
         enum class IState
         {
             /** Specifies that the property is currently disabled. */
@@ -121,11 +121,11 @@ namespace Item
             SET = 0x0040
         };
 
-        // helper class for returning result pairs for calls to ISet::StateAndItem
-        // that contain the IState and the IBase at the same time.
-        // IBase aItem will be set when IState is either SET or DEFAULT. The
-        // DEFAULT will be the evtl. replaced one from ISet (see
-        // ModelSpecificIValues)
+        // helper class for returning result pairs for calls to ItemSet::StateAndItem
+        // that contain the IState and the ItemBase at the same time.
+        // ItemBase aItem will be set when IState is either SET or DEFAULT. The
+        // DEFAULT will be the evtl. replaced one from ItemSet (see
+        // ModelSpecificItemValues)
         template< class TargetType > class StateAndItem
         {
         private:
@@ -155,7 +155,7 @@ namespace Item
     private:
         // helper class for an ImplInvalidateItem - placeholder for InvaidateState
         // SfxItemState::DONTCARE -> IsInvalidItem -> pItem == INVALID_POOL_ITEM -> reinterpret_cast<SfxPoolItem*>(-1)
-        class ImplInvalidateItem : public IBase
+        class ImplInvalidateItem : public ItemBase
         {
         public:
             ImplInvalidateItem() = default;
@@ -163,34 +163,34 @@ namespace Item
 
         // helper class for a ImplDisableItem - placeholder for InvaidateState
         // SfxItemState::DISABLED -> IsVoidItem() -> instance of SfxVoidItem, virtual bool IsVoidItem()
-        class ImplDisableItem : public IBase
+        class ImplDisableItem : public ItemBase
         {
         public:
             ImplDisableItem() = default;
         };
 
-        // the Parent of this ISet
+        // the Parent of this ItemSet
         SharedPtr m_aParent;
 
         // model-specific ItemValues, e.g. overridden defaults.
         // Maybe set or not set, empty allowed here.
-        ModelSpecificIValues::SharedPtr m_aModelSpecificIValues;
+        ModelSpecificItemValues::SharedPtr m_aModelSpecificIValues;
 
         // the items as content
-        std::unordered_map<size_t, IBase::SharedPtr> m_aItems;
+        std::unordered_map<size_t, ItemBase::SharedPtr> m_aItems;
 
         // single global static instance for helper class ImplInvalidateItem
-        static const IBase::SharedPtr& getInvalidateItem()
+        static const ItemBase::SharedPtr& getInvalidateItem()
         {
-            static IBase::SharedPtr aImplInvalidateItem(new ImplInvalidateItem());
+            static ItemBase::SharedPtr aImplInvalidateItem(new ImplInvalidateItem());
 
             return aImplInvalidateItem;
         }
 
         // single global static instance for helper class ImplDisableItem
-        static const IBase::SharedPtr& getDisableItem()
+        static const ItemBase::SharedPtr& getDisableItem()
         {
-            static IBase::SharedPtr aImplDisableItem(new ImplDisableItem());
+            static ItemBase::SharedPtr aImplDisableItem(new ImplDisableItem());
 
             return aImplDisableItem;
         }
@@ -198,22 +198,22 @@ namespace Item
     protected:
         // constructor - protected BY DEFAULT - do NOT CHANGE (!)
         // Use ::Create(...) method instead
-        ISet(const ModelSpecificIValues::SharedPtr& rModelSpecificIValues);
+        ItemSet(const ModelSpecificItemValues::SharedPtr& rModelSpecificIValues);
 
     public:
-        virtual ~ISet();
+        virtual ~ItemSet();
 
         // noncopyable
-        ISet(const ISet&) = delete;
-        ISet& operator=(const ISet&) = delete;
+        ItemSet(const ItemSet&) = delete;
+        ItemSet& operator=(const ItemSet&) = delete;
 
         // parent
         void SetParent(const SharedPtr& rNewParent);
         const SharedPtr& GetParent() const;
 
-        static SharedPtr Create(const ModelSpecificIValues::SharedPtr& rModelSpecificIValues);
+        static SharedPtr Create(const ModelSpecificItemValues::SharedPtr& rModelSpecificIValues);
 
-        const ModelSpecificIValues::SharedPtr& GetModelSpecificIValues() const;
+        const ModelSpecificItemValues::SharedPtr& GetModelSpecificIValues() const;
 
         template< typename TItem > void InvalidateItem()
         {
@@ -232,20 +232,20 @@ namespace Item
         template< typename TItem > std::shared_ptr<TItem> GetDefault() const
         {
             // get static available default as instance
-            IBase::SharedPtr aRetval(TItem::GetDefault());
-            assert(aRetval && "empty IBase::SharedPtr not allowed for default (!)");
+            ItemBase::SharedPtr aRetval(TItem::GetDefault());
+            assert(aRetval && "empty ItemBase::SharedPtr not allowed for default (!)");
 
             if(m_aModelSpecificIValues)
             {
                 // may use model-specific default, get from helper
-                // helper *will* fallback to IBase default
+                // helper *will* fallback to ItemBase default
                 aRetval = m_aModelSpecificIValues->GetDefault(aRetval);
             }
 
             return std::static_pointer_cast<TItem>(aRetval);
         }
 
-        void SetItem(const IBase::SharedPtr& rItem);
+        void SetItem(const ItemBase::SharedPtr& rItem);
 
         template< typename TItem > StateAndItem<TItem> GetStateAndItem(bool bSearchParent = true) const
         {
@@ -254,7 +254,7 @@ namespace Item
 
             if(aRetval != m_aItems.end()) // && aRetval->second)
             {
-                assert(aRetval->second && "empty IBase::SharedPtr set in ISet (!)");
+                assert(aRetval->second && "empty ItemBase::SharedPtr set in ItemSet (!)");
 
                 if(aRetval->second.get() == getInvalidateItem().get())
                 {
@@ -296,6 +296,6 @@ namespace Item
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // INCLUDED_ITEM_BASE_ISET_HXX
+#endif // INCLUDED_ITEM_BASE_ITEMSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/item/base/ModelSpecificIValues.hxx b/include/item/base/ModelSpecificItemValues.hxx
index 9876a5842a07..830145f9ab92 100644
--- a/include/item/base/ModelSpecificIValues.hxx
+++ b/include/item/base/ModelSpecificItemValues.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ITEM_BASE_MODELSPECIFICIVALUES_HXX
-#define INCLUDED_ITEM_BASE_MODELSPECIFICIVALUES_HXX
+#ifndef INCLUDED_ITEM_BASE_MODELSPECIFICITEMVALUES_HXX
+#define INCLUDED_ITEM_BASE_MODELSPECIFICITEMVALUES_HXX
 
 #include <memory>
 #include <item/itemdllapi.h>
 #include <unordered_map>
-#include <item/base/IBase.hxx>
+#include <item/base/ItemBase.hxx>
 #include <sal/types.h>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -37,40 +37,40 @@ namespace Item
     // - maybe: ItemNames - currently in ::TakeItemName and others
     // - maybe: hold MapMode info to allow correct GetPresentation
     //   executions
-    class ITEM_DLLPUBLIC ModelSpecificIValues : public std::enable_shared_from_this<ModelSpecificIValues>
+    class ITEM_DLLPUBLIC ModelSpecificItemValues : public std::enable_shared_from_this<ModelSpecificItemValues>
     {
     public:
         // SharedPtr typedef to be used handling instances of this type
-        typedef std::shared_ptr<ModelSpecificIValues> SharedPtr;
+        typedef std::shared_ptr<ModelSpecificItemValues> SharedPtr;
 
     private:
         // the alternative default items
-        std::unordered_map<size_t, IBase::SharedPtr> m_aAlternativeItems;
+        std::unordered_map<size_t, ItemBase::SharedPtr> m_aAlternativeItems;
 
     protected:
         // constructor - protected BY DEFAULT - do NOT CHANGE (!)
         // Use ::Create(...) method instead
-        ModelSpecificIValues();
+        ModelSpecificItemValues();
 
     public:
-        virtual ~ModelSpecificIValues();
+        virtual ~ModelSpecificItemValues();
 
         // noncopyable
-        ModelSpecificIValues(const ModelSpecificIValues&) = delete;
-        ModelSpecificIValues& operator=(const ModelSpecificIValues&) = delete;
+        ModelSpecificItemValues(const ModelSpecificItemValues&) = delete;
+        ModelSpecificItemValues& operator=(const ModelSpecificItemValues&) = delete;
 
         // create instance
         static SharedPtr Create();
 
         // AlternativeDefault interface
-        void SetAlternativeDefaultItem(const IBase::SharedPtr& rItem);
-        bool IsDefault(const IBase::SharedPtr& rItem) const;
-        const IBase::SharedPtr& GetDefault(const IBase::SharedPtr& rItem) const;
+        void SetAlternativeDefaultItem(const ItemBase::SharedPtr& rItem);
+        bool IsDefault(const ItemBase::SharedPtr& rItem) const;
+        const ItemBase::SharedPtr& GetDefault(const ItemBase::SharedPtr& rItem) const;
     };
 } // end of namespace Item
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // INCLUDED_ITEM_BASE_MODELSPECIFICIVALUES_HXX
+#endif // INCLUDED_ITEM_BASE_MODELSPECIFICITEMVALUES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/item/base/SlotSet.hxx b/include/item/base/SlotSet.hxx
index ecc08604eec1..11789892385a 100755
--- a/include/item/base/SlotSet.hxx
+++ b/include/item/base/SlotSet.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_ITEM_BASE_SLOTSET_HXX
 
 #include <cassert>
-#include <item/base/ModelSpecificIValues.hxx>
+#include <item/base/ModelSpecificItemValues.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -36,7 +36,7 @@ namespace Item
 
     private:
         // the slots as content
-        std::unordered_map<SlotID, IBase::SharedPtr> m_aSlots;
+        std::unordered_map<SlotID, ItemBase::SharedPtr> m_aSlots;
 
     protected:
         // constructor - protected BY DEFAULT - do NOT CHANGE (!)
@@ -57,7 +57,7 @@ namespace Item
 
         static SharedPtr Create();
 
-        void SetSlot(SlotID aSlotID, const IBase::SharedPtr& rItem);
+        void SetSlot(SlotID aSlotID, const ItemBase::SharedPtr& rItem);
         void SetSlots(const SlotSet& rSlotSet);
 
         template< typename TargetType > std::shared_ptr<const TargetType> GetSlot(SlotID aSlotID) const
@@ -66,8 +66,8 @@ namespace Item
 
             if(aRetval != m_aSlots.end()) // && aRetval->second)
             {
-                assert(aRetval->second && "empty IBase::SharedPtr set in SlotSet (!)");
-                assert(typeid(*aRetval->second) == typeid(TargetType) && "wrong IBase::SharedPtr type in SlotSet (!)");
+                assert(aRetval->second && "empty ItemBase::SharedPtr set in SlotSet (!)");
+                assert(typeid(*aRetval->second) == typeid(TargetType) && "wrong ItemBase::SharedPtr type in SlotSet (!)");
 
                 return std::static_pointer_cast<TargetType>(aRetval->second);
             }
diff --git a/include/item/simple/CntInt16.hxx b/include/item/simple/CntInt16.hxx
index 6be33aabab51..f55970596d2c 100644
--- a/include/item/simple/CntInt16.hxx
+++ b/include/item/simple/CntInt16.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_ITEM_SIMPLE_CNTINT16_HXX
 #define INCLUDED_ITEM_SIMPLE_CNTINT16_HXX
 
-#include <item/base/IBaseStaticHelper.hxx>
+#include <item/base/ItemBaseStaticHelper.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -21,7 +21,7 @@ namespace Item
     // a sorted list for fast accesses. This requires ::operator< to be
     // implemented.
     class CntInt16;
-    typedef IBaseStaticHelper<CntInt16, IAdministrator_set> CntInt16StaticHelper;
+    typedef ItemBaseStaticHelper<CntInt16, IAdministrator_set> CntInt16StaticHelper;
 
     class ITEM_DLLPUBLIC CntInt16 : public CntInt16StaticHelper
     {
@@ -37,8 +37,8 @@ namespace Item
         virtual ~CntInt16();
 
         static CntInt16::SharedPtr Create(sal_Int16 nValue);
-        virtual bool operator==(const IBase& rCandidate) const override;
-        virtual bool operator<(const IBase& rCandidate) const override;
+        virtual bool operator==(const ItemBase& rCandidate) const override;
+        virtual bool operator<(const ItemBase& rCandidate) const override;
         sal_Int16 GetValue() const;
     };
 } // end of namespace Item
diff --git a/include/item/simple/CntOUString.hxx b/include/item/simple/CntOUString.hxx
index b9b509b43e7f..d11ee3d8a804 100644
--- a/include/item/simple/CntOUString.hxx
+++ b/include/item/simple/CntOUString.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_ITEM_SIMPLE_CNTOUSTRING_HXX
 #define INCLUDED_ITEM_SIMPLE_CNTOUSTRING_HXX
 
-#include <item/base/IBaseStaticHelper.hxx>
+#include <item/base/ItemBaseStaticHelper.hxx>
 #include <rtl/ustring.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@ namespace Item
     // a hashed list for fast accesses. This requires ::operator== and
     // ::GetUniqueKey() to be implemented.
     class CntOUString;
-    typedef IBaseStaticHelper<CntOUString, IAdministrator_unordered_set> CntOUStringStaticHelper;
+    typedef ItemBaseStaticHelper<CntOUString, IAdministrator_unordered_set> CntOUStringStaticHelper;
 
     class ITEM_DLLPUBLIC CntOUString : public CntOUStringStaticHelper
     {
@@ -38,7 +38,7 @@ namespace Item
         virtual ~CntOUString();
 
         static std::shared_ptr<const CntOUString> Create(const rtl::OUString& rValue);
-        virtual bool operator==(const IBase& rCandidate) const override;
+        virtual bool operator==(const ItemBase& rCandidate) const override;
         virtual size_t GetUniqueKey() const override;
         const rtl::OUString& GetValue() const;
     };
diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index 9d73260605ca..2cea8cd1e85c 100644
--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
@@ -24,6 +24,7 @@
 #include <sal/types.h>
 #include <svl/poolitem.hxx>
 #include <tools/debug.hxx>
+#include <item/base/ItemBase.hxx>
 
 class SfxBindings;
 
@@ -62,7 +63,7 @@ public:
     sal_uInt16          GetId() const { return nId; }
 
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                      const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem );
+                                      const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem );
 
     MapUnit             GetCoreMetric() const;
 
@@ -78,7 +79,7 @@ class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem
 
 protected:
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                      const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                      const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 public:
                             SfxStatusForwarder( sal_uInt16 nSlotId,
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 367ade344dc0..849634b3b32a 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -26,7 +26,7 @@
 #include <sfx2/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 #include <sfx2/groupid.hxx>
-#include <item/base/IBase.hxx>
+#include <item/base/ItemBase.hxx>
 #include <functional>
 
 #include <climits>
@@ -101,14 +101,14 @@ template<class T> SfxPoolItem* createSfxPoolItem()
 {
     return T::CreateDefault();
 }
-template<class T> std::shared_ptr<const T> createSlotItem(const Item::IBase::AnyIDArgs& rArgs)
+template<class T> std::shared_ptr<const T> createSlotItem(const Item::ItemBase::AnyIDArgs& rArgs)
 {
     return T::CreateFromAny(rArgs);
 }
 struct SfxType
 {
     std::function<SfxPoolItem* ()> const createSfxPoolItemFunc;
-    std::function<Item::IBase::SharedPtr(const Item::IBase::AnyIDArgs& rArgs)> const createSlotItemFunc;
+    std::function<Item::ItemBase::SharedPtr(const Item::ItemBase::AnyIDArgs& rArgs)> const createSlotItemFunc;
     const std::type_info* pType;
     sal_uInt16 const nAttribs;
     SfxTypeAttrib aAttrib[1]; // variable length
@@ -123,7 +123,7 @@ struct SfxType
         return std::unique_ptr<SfxPoolItem>(createSfxPoolItemFunc());
     }
 
-    Item::IBase::SharedPtr CreateSlotItem(const Item::IBase::AnyIDArgs& rArgs) const
+    Item::ItemBase::SharedPtr CreateSlotItem(const Item::ItemBase::AnyIDArgs& rArgs) const
     {
         return createSlotItemFunc(rArgs);
     }
@@ -137,7 +137,7 @@ struct SfxType
 struct SfxType0
 {
     std::function<SfxPoolItem* ()> const createSfxPoolItemFunc;
-    std::function<Item::IBase::SharedPtr(const Item::IBase::AnyIDArgs& rArgs)> const createSlotItemFunc;
+    std::function<Item::ItemBase::SharedPtr(const Item::ItemBase::AnyIDArgs& rArgs)> const createSlotItemFunc;
     const std::type_info* pType;
     sal_uInt16 const nAttribs;
 
@@ -149,7 +149,7 @@ struct SfxType0
 #define SFX_DECL_TYPE(n) struct SfxType##n \
 { \
     std::function<SfxPoolItem* ()> createSfxPoolItemFunc; \
-    std::function<Item::IBase::SharedPtr(const Item::IBase::AnyIDArgs& rArgs)> const createSlotItemFunc; \
+    std::function<Item::ItemBase::SharedPtr(const Item::ItemBase::AnyIDArgs& rArgs)> const createSlotItemFunc; \
     const std::type_info* pType; \
     sal_uInt16 nAttribs; \
     SfxTypeAttrib aAttrib[n]; \
@@ -208,7 +208,7 @@ struct SfxFormalArgument
         return pType->CreateSfxPoolItem();
     }
 
-    Item::IBase::SharedPtr CreateSlotItem(const Item::IBase::AnyIDArgs& rArgs) const
+    Item::ItemBase::SharedPtr CreateSlotItem(const Item::ItemBase::AnyIDArgs& rArgs) const
     {
         return pType->CreateSlotItem(rArgs);
     }
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index 048a7a7230f8..13ba60d1a319 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -46,7 +46,7 @@ class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
         void    UnBind();
         void    ReBind();
 
-        virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem );
+        virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem );
 
         // XComponent
         virtual void SAL_CALL dispose() override;
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index ea6c50135b67..9fb62d2ce88f 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -76,7 +76,7 @@ public:
 
 protected:
 
-    virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+    virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
 
 private:
     ItemUpdateReceiverInterface& mrItemUpdateReceiver;
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 10cc270661fe..767a82031d93 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -92,7 +92,7 @@ protected:
 
     // Old sfx2 interface
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem );
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem );
     virtual void    Click();
     virtual void    Command( const CommandEvent& rCEvt );
     virtual bool    MouseButtonDown( const MouseEvent & );
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 719a22ea1a58..7b1d844e6bdb 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -131,7 +131,7 @@ protected:
     DECL_LINK( ClosePopupWindow, SfxPopupWindow *, void );
 
     // old SfxToolBoxControl methods
-    virtual void               StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem );
+    virtual void               StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem );
     virtual void               Select( sal_uInt16 nSelectModifier );
 
     virtual void               DoubleClick();
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index f6b88338f6b7..870905761367 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -130,7 +130,7 @@ public:
     static OUString getSlaveCommand( const css::util::URL& rURL );
 
     void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer const * pServ );
-    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     void                setMasterSlaveCommand( bool bSet );
     /// @throws css::uno::RuntimeException
     void       dispatch( const css::util::URL& aURL,
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 3725a1e2f183..6a455788c273 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -28,7 +28,7 @@
 #include <o3tl/sorted_vector.hxx>
 
 // I2TM
-#include <item/base/ModelSpecificIValues.hxx>
+#include <item/base/ModelSpecificItemValues.hxx>
 // ~I2TM
 
 class SfxBroadcaster;
@@ -210,9 +210,9 @@ private:
      //IDs below or equal are Which IDs, IDs above slot IDs
     static const sal_uInt16         SFX_WHICH_MAX = 4999;
 
-    // I2TM Transfer phase: deliver ModelSpecificIValues for this SfxItemPool/Model
+    // I2TM Transfer phase: deliver ModelSpecificItemValues for this SfxItemPool/Model
 public:
-    virtual Item::ModelSpecificIValues::SharedPtr getModelSpecificIValues() const;
+    virtual Item::ModelSpecificItemValues::SharedPtr getModelSpecificIValues() const;
     // ~I2TM
 };
 
diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx
index c653196dfef8..3ff213936290 100644
--- a/include/svx/ParaSpacingControl.hxx
+++ b/include/svx/ParaSpacingControl.hxx
@@ -37,7 +37,7 @@ public:
     virtual ~ParaULSpacingControl() override;
 
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
     virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override = 0;
 };
 
@@ -71,7 +71,7 @@ public:
     virtual void SAL_CALL dispose() override;
 
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
     virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override = 0;
 
     // XContextChangeEventListener
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 6d0da8d8a429..72b148aa8424 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -57,7 +57,7 @@ private:
 
 protected:
     virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                               const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                               const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 public:
     SvxBmpMaskSelectItem( SvxBmpMask& rMask,
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 4ebf49992607..4e4bd075a1a3 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -49,7 +49,7 @@ public:
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 };
 
 #endif
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index 50e998b46cd2..55d5d87e6f0e 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -70,7 +70,7 @@ public:
     SvxFillToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
     virtual ~SvxFillToolBoxControl() override;
 
-    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
     void Update();
     virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
 };
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 6a6f9942f1b5..c0c04b8334ee 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -237,7 +237,7 @@ class Svx3DCtrlItem : public SfxControllerItem
 {
  protected:
     virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
-                                const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
  public:
     Svx3DCtrlItem( sal_uInt16, SfxBindings* );
@@ -255,7 +255,7 @@ class SvxConvertTo3DItem : public SfxControllerItem
     bool                        bState;
 
 protected:
-    virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+    virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
 
 public:
     SvxConvertTo3DItem(sal_uInt16 nId, SfxBindings* pBindings);
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 5a4a152c4739..1857465694ec 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -59,7 +59,7 @@ class SvxFontWorkControllerItem : public SfxControllerItem
 
 protected:
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
 
 public:
     SvxFontWorkControllerItem(sal_uInt16 nId, SvxFontWorkDialog&, SfxBindings&);
diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index aa318491baf8..03fb6b62f2a2 100644
--- a/include/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
@@ -41,7 +41,7 @@ public:
     virtual void    Select(sal_uInt16 nSelectModifier) override;
 
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 private:
     DECL_LINK( WaitDoubleClickHdl, Timer*, void );
     void impl_executePaintBrush();
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index 9052f5b19358..854484b90908 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -32,7 +32,7 @@ public:
     SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SvxGrafToolBoxControl() override;
 
-    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
 };
 
@@ -100,7 +100,7 @@ public:
                         SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
                         virtual ~SvxGrafModeToolBoxControl() override;
 
-    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
 };
 
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index a4f9897d4f36..eed8b334f498 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -67,7 +67,7 @@ class SvxIMapDlgItem : public SfxControllerItem
 protected:
 
     virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                               const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                               const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 
 public:
diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx
index 31f547dcd4e5..68a9eec5ad84 100644
--- a/include/svx/insctrl.hxx
+++ b/include/svx/insctrl.hxx
@@ -27,7 +27,7 @@ class SVX_DLLPUBLIC SvxInsertStatusBarControl : public SfxStatusBarControl
 {
 public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void    Paint( const UserDrawEvent& rEvt ) override;
 
     SFX_DECL_STATUSBAR_CONTROL();
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index 9f727d905079..e6ddc26de437 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -31,7 +31,7 @@ public:
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
     SFX_DECL_TOOLBOX_CONTROL();
 
@@ -52,7 +52,7 @@ public:
 
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 };
 
 #endif
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index ef1fc9c1d97f..60166d60e38b 100644
--- a/include/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
@@ -49,7 +49,7 @@ public:
 
     virtual void StateChanged( sal_uInt16 nSID,
                                SfxItemState eState,
-                               const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                               const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
 };
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 51a1b5a2abbb..cdb9c2eb99ac 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -51,7 +51,7 @@ public:
     virtual ~SvxLineStyleToolBoxControl() override;
 
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                      const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                      const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     void                Update( const SfxPoolItem* pState );
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
 };
@@ -69,7 +69,7 @@ public:
     virtual ~SvxLineWidthToolBoxControl() override;
 
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                      const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                      const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
 };
 
diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx
index 41498dbaecdd..29b672d07636 100644
--- a/include/svx/modctrl.hxx
+++ b/include/svx/modctrl.hxx
@@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl
 {
 public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void    Paint( const UserDrawEvent& rUsrEvt ) override;
     virtual void    Click() override;
 
diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index b656bd6f59af..7a5b35b39e86 100644
--- a/include/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
@@ -37,7 +37,7 @@ public:
     SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
     virtual ~SvxPosSizeStatusBarControl() override;
 
-    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void    Paint( const UserDrawEvent& rEvt ) override;
     virtual void    Command( const CommandEvent& rCEvt ) override;
 };
diff --git a/include/svx/selctrl.hxx b/include/svx/selctrl.hxx
index bdbfcde585b6..ae346c2cbfa0 100644
--- a/include/svx/selctrl.hxx
+++ b/include/svx/selctrl.hxx
@@ -32,7 +32,7 @@ public:
     SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
     virtual void     StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                   const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                   const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual bool     MouseButtonDown( const MouseEvent& rEvt ) override;
     virtual void     Paint( const UserDrawEvent& rEvt ) override;
 
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 054436e9e7d5..5a5e3181e1d1 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -170,7 +170,7 @@ public:
     virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
 
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
 
     DECL_LINK( VisibilityNotification, SvxStyleBox_Impl&, void );
 protected:
@@ -259,7 +259,7 @@ public:
     virtual ~SvxSimpleUndoRedoController() override;
 
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
 };
 
 class SVX_DLLPUBLIC SvxCurrencyToolBoxControl : public svt::PopupWindowController
diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index a5b3009f6ae5..180a3ed26510 100644
--- a/include/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
@@ -46,7 +46,7 @@ public:
 
     virtual void                Select(sal_uInt16 nSelectModifier) override;
     virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 };
 
 #endif
diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx
index 6da4f24785e0..cd64d57993a4 100644
--- a/include/svx/verttexttbxctrl.hxx
+++ b/include/svx/verttexttbxctrl.hxx
@@ -35,7 +35,7 @@ public:
     virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
     virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 };
 
 class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl
diff --git a/include/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx
index 7302546d6cd3..ec479fcc8dea 100644
--- a/include/svx/xmlsecctrl.hxx
+++ b/include/svx/xmlsecctrl.hxx
@@ -39,7 +39,7 @@ public:
     XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb );
     virtual ~XmlSecStatusBarControl() override;
 
-    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void    Paint( const UserDrawEvent& rEvt ) override;
     virtual void    Command( const CommandEvent& rCEvt ) override;
 };
diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx
index 5cb49f7d3de8..88301bbc2f29 100644
--- a/include/svx/zoomctrl.hxx
+++ b/include/svx/zoomctrl.hxx
@@ -32,7 +32,7 @@ private:
 
 public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void    Paint( const UserDrawEvent& rEvt ) override;
     virtual void    Command( const CommandEvent& rCEvt ) override;
 
diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index 44088df9ed2b..7c289a522ba1 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -44,7 +44,7 @@ public:
     SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb );
     virtual ~SvxZoomSliderControl() override;
 
-    virtual void  StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void  StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void  Paint( const UserDrawEvent& rEvt ) override;
     virtual bool  MouseButtonDown( const MouseEvent & ) override;
     virtual bool  MouseButtonUp( const MouseEvent & ) override;
diff --git a/item/Library_item.mk b/item/Library_item.mk
index 7297d680ee55..dd7de41135ca 100644
--- a/item/Library_item.mk
+++ b/item/Library_item.mk
@@ -31,10 +31,11 @@ $(eval $(call gb_Library_add_defs,item,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,item,\
-    item/source/base/IBase \
-    item/source/base/IAdministrator \
-    item/source/base/ModelSpecificIValues \
-    item/source/base/ISet \
+    item/source/base/ItemBase \
+    item/source/base/ItemAdministrator \
+    item/source/base/ModelSpecificItemValues \
+    item/source/base/ItemSet \
+    item/source/base/SlotSet \
     item/source/simple/CntInt16 \
     item/source/simple/CntOUString \
 ))
diff --git a/item/inc/pch/precompiled_item.hxx b/item/inc/pch/precompiled_item.hxx
index 4b130dcbd042..bbe268adae3d 100644
--- a/item/inc/pch/precompiled_item.hxx
+++ b/item/inc/pch/precompiled_item.hxx
@@ -21,6 +21,6 @@
 */
 
 #include <algorithm>
-#include <item/base/IBase.hxx>
+#include <item/base/ItemBase.hxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/item/source/base/IAdministrator.cxx b/item/source/base/ItemAdministrator.cxx
index 9d841491124f..796a4b844aa0 100644
--- a/item/source/base/IAdministrator.cxx
+++ b/item/source/base/ItemAdministrator.cxx
@@ -7,41 +7,41 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <item/base/IAdministrator.hxx>
+#include <item/base/ItemAdministrator.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace Item
 {
-    void IAdministrator::SetAdministrated(const IBase& rIBase) const
+    void ItemAdministrator::SetAdministrated(const ItemBase& rIBase) const
     {
-        const_cast<IBase&>(rIBase).m_bAdministrated = true;
+        const_cast<ItemBase&>(rIBase).m_bAdministrated = true;
     }
 
-    IAdministrator::IAdministrator(const IBase* pDefault)
-    :   m_aDefault(IBase::SharedPtr(pDefault))
+    ItemAdministrator::ItemAdministrator(const ItemBase* pDefault)
+    :   m_aDefault(ItemBase::SharedPtr(pDefault))
     {
         assert(pDefault != nullptr && "nullptr not allowed, default *is* required (!)");
     }
 
-    IAdministrator::~IAdministrator()
+    ItemAdministrator::~ItemAdministrator()
     {
     }
 
-    void IAdministrator::HintExpired(const IBase* /*pIBase*/)
+    void ItemAdministrator::HintExpired(const ItemBase* /*pIBase*/)
     {
         // Default does nothing and will be triggered from m_aDefault being destructed
         // using the HintExpired calls in the administrated classes. This happens due to
-        // m_aDefault being destroyed from ~IAdministrator() above as last thing in
-        // IAdministrator cleanup, the derived classes are no longer available at that time.
+        // m_aDefault being destroyed from ~ItemAdministrator() above as last thing in
+        // ItemAdministrator cleanup, the derived classes are no longer available at that time.
     }
 
-    const IBase::SharedPtr& IAdministrator::GetDefault() const
+    const ItemBase::SharedPtr& ItemAdministrator::GetDefault() const
     {
         return m_aDefault;
     }
 
-    bool IAdministrator::IsDefault(const IBase* pIBase) const
+    bool ItemAdministrator::IsDefault(const ItemBase* pIBase) const
     {
         assert(pIBase != nullptr && "nullptr not allowed (!)");
         return pIBase == m_aDefault.get() || pIBase->operator==(*m_aDefault.get());
@@ -52,13 +52,13 @@ namespace Item
 
 namespace Item
 {
-    IAdministrator_set::IAdministrator_set(const IBase* pDefault)
-    :   IAdministrator(pDefault),
+    IAdministrator_set::IAdministrator_set(const ItemBase* pDefault)
+    :   ItemAdministrator(pDefault),
         m_aEntries()
     {
     }
 
-    IBase::SharedPtr IAdministrator_set::Create(const IBase* pIBase)
+    ItemBase::SharedPtr IAdministrator_set::Create(const ItemBase* pIBase)
     {
         assert(pIBase != nullptr && "nullptr not allowed (!)");
 
@@ -85,20 +85,20 @@ namespace Item
             // start using offered instance and administrate it from now
             SetAdministrated(*pIBase);
             m_aEntries.insert(pIBase);
-            return IBase::SharedPtr(pIBase);
+            return ItemBase::SharedPtr(pIBase);
         }
     }
 
-    void IAdministrator_set::HintExpired(const IBase* pIBase)
+    void IAdministrator_set::HintExpired(const ItemBase* pIBase)
     {
         // called from ::~Item. This happens in two cases:
         // (1) a temporary Item instance gets deleted
         // (2) last shared_ptr was deleted
         // The caller should have already checked the
         // Administrated-flag, so only administrated instances
-        // of IBase should be handled here which is case (2)
+        // of ItemBase should be handled here which is case (2)
         assert(pIBase != nullptr && "nullptr not allowed (!)");
-        assert(pIBase->IsAdministrated() && "call only for administrated instances of IBase (!)");
+        assert(pIBase->IsAdministrated() && "call only for administrated instances of ItemBase (!)");
         m_aEntries.erase(pIBase);
     }
 } // end of namespace Item
@@ -107,13 +107,13 @@ namespace Item
 
 namespace Item
 {
-    IAdministrator_unordered_set::IAdministrator_unordered_set(const IBase* pDefault)
-    :   IAdministrator(pDefault),
+    IAdministrator_unordered_set::IAdministrator_unordered_set(const ItemBase* pDefault)
+    :   ItemAdministrator(pDefault),
         m_aEntries()
     {
     }
 
-    IBase::SharedPtr IAdministrator_unordered_set::Create(const IBase* pIBase)
+    ItemBase::SharedPtr IAdministrator_unordered_set::Create(const ItemBase* pIBase)
     {
         assert(pIBase != nullptr && "nullptr not allowed (!)");
 
@@ -140,20 +140,20 @@ namespace Item
             // start using offered instance and administrate it from now
             SetAdministrated(*pIBase);
             m_aEntries.insert(pIBase);
-            return IBase::SharedPtr(pIBase);
+            return ItemBase::SharedPtr(pIBase);
         }
     }
 
-    void IAdministrator_unordered_set::HintExpired(const IBase* pIBase)
+    void IAdministrator_unordered_set::HintExpired(const ItemBase* pIBase)
     {
         // called from ::~Item. This happens in two cases:
         // (1) a temporary Item instance gets deleted
         // (2) last shared_ptr was deleted
         // The caller should have already checked the
         // Administrated-flag, so only administrated instances
-        // of IBase should be handled here which is case (2)
+        // of ItemBase should be handled here which is case (2)
         assert(pIBase != nullptr && "nullptr not allowed (!)");
-        assert(pIBase->IsAdministrated() && "call only for administrated instances of IBase (!)");
+        assert(pIBase->IsAdministrated() && "call only for administrated instances of ItemBase (!)");
         m_aEntries.erase(pIBase);
     }
 } // end of namespace Item
@@ -162,11 +162,11 @@ namespace Item
 
 namespace Item
 {
-    std::vector<const IBase*>::iterator IAdministrator_vector::find(const IBase* pIBase)
+    std::vector<const ItemBase*>::iterator IAdministrator_vector::find(const ItemBase* pIBase)
     {
         // find has to linearly traverse through instances and use operator==
         assert(pIBase != nullptr && "nullptr not allowed (!)");
-        for(std::vector<const IBase*>::iterator candidate(m_aEntries.begin()); candidate != m_aEntries.end(); candidate++)
+        for(std::vector<const ItemBase*>::iterator candidate(m_aEntries.begin()); candidate != m_aEntries.end(); candidate++)
         {
             if(*candidate != nullptr)
             {
@@ -180,7 +180,7 @@ namespace Item
         return m_aEntries.end();
     }
 
-    void IAdministrator_vector::insert(const IBase* pIBase)
+    void IAdministrator_vector::insert(const ItemBase* pIBase)
     {
         // insert reuses free slots if there are some, else
         // appends to existing vector
@@ -197,7 +197,7 @@ namespace Item
         return;
     }
 
-    void IAdministrator_vector::erase(std::vector<const IBase*>::iterator& rIter)
+    void IAdministrator_vector::erase(std::vector<const ItemBase*>::iterator& rIter)
     {
         if(rIter != m_aEntries.end())
         {
@@ -212,10 +212,10 @@ namespace Item
                 && m_aEntries.size() > m_aFreeSlots.size()
                 && m_aFreeSlots.size() * 2 > m_aEntries.size())
             {
-                std::vector<const IBase*> aNewEntries;
+                std::vector<const ItemBase*> aNewEntries;
                 aNewEntries.reserve(m_aEntries.size() - m_aFreeSlots.size());
 
-                for(std::vector<const IBase*>::iterator candidate(m_aEntries.begin()); candidate != m_aEntries.end(); candidate++)
+                for(std::vector<const ItemBase*>::iterator candidate(m_aEntries.begin()); candidate != m_aEntries.end(); candidate++)
                 {
                     if(*candidate != nullptr)
                     {
@@ -234,14 +234,14 @@ namespace Item
         }
     }
 
-    IAdministrator_vector::IAdministrator_vector(const IBase* pDefault)
-    :   IAdministrator(pDefault),
+    IAdministrator_vector::IAdministrator_vector(const ItemBase* pDefault)
+    :   ItemAdministrator(pDefault),
         m_aEntries(),
         m_aFreeSlots()
     {
     }
 
-    IBase::SharedPtr IAdministrator_vector::Create(const IBase* pIBase)
+    ItemBase::SharedPtr IAdministrator_vector::Create(const ItemBase* pIBase)
     {
         assert(pIBase != nullptr && "nullptr not allowed (!)");
 
@@ -268,20 +268,20 @@ namespace Item
             // start using offered instance and administrate it from now
             SetAdministrated(*pIBase);
             insert(pIBase);
-            return IBase::SharedPtr(pIBase);
+            return ItemBase::SharedPtr(pIBase);
         }
     }
 
-    void IAdministrator_vector::HintExpired(const IBase* pIBase)
+    void IAdministrator_vector::HintExpired(const ItemBase* pIBase)
     {
         // called from ::~Item. This happens in two cases:
         // (1) a temporary Item instance gets deleted
         // (2) last shared_ptr was deleted
         // The caller should have already checked the
         // Administrated-flag, so only administrated instances
-        // of IBase should be handled here which is case (2)
+        // of ItemBase should be handled here which is case (2)
         assert(pIBase != nullptr && "nullptr not allowed (!)");
-        assert(pIBase->IsAdministrated() && "call only for administrated instances of IBase (!)");
+        assert(pIBase->IsAdministrated() && "call only for administrated instances of ItemBase (!)");
         auto iter(find(pIBase));
         erase(iter);
     }
diff --git a/item/source/base/IBase.cxx b/item/source/base/ItemBase.cxx
index a6a4fd18dd3a..4da304dbed3e 100644
--- a/item/source/base/IBase.cxx
+++ b/item/source/base/ItemBase.cxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <item/base/IBase.hxx>
-#include <item/base/IAdministrator.hxx>
+#include <item/base/ItemBase.hxx>
+#include <item/base/ItemAdministrator.hxx>
 #include <cassert>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -171,25 +171,25 @@ class SW_DLLPUBLIC SwPaMItem : public SfxPoolItem
 
 namespace Item
 {
-    IBase::IBase()
-    :   std::enable_shared_from_this<IBase>(),
+    ItemBase::ItemBase()
+    :   std::enable_shared_from_this<ItemBase>(),
         m_bAdministrated(false)
     {
     }
 
-    bool IBase::CheckSameType(const IBase& rCmp) const
+    bool ItemBase::CheckSameType(const ItemBase& rCmp) const
     {
         return typeid(rCmp) == typeid(*this);
     }
 
-    IAdministrator* IBase::GetIAdministrator() const
+    ItemAdministrator* ItemBase::GetIAdministrator() const
     {
         // not intended to be used, error
-        assert(false && "IBase::GetIAdministrator call not allowed (!)");
+        assert(false && "ItemBase::GetIAdministrator call not allowed (!)");
         return nullptr;
     }
 
-    void IBase::PutValues(const AnyIDArgs& rArgs)
+    void ItemBase::PutValues(const AnyIDArgs& rArgs)
     {
         for(const auto& arg : rArgs)
         {
@@ -197,23 +197,23 @@ namespace Item
         }
     }
 
-    void IBase::PutValue(const css::uno::Any& /*rVal*/, sal_uInt8 /*nMemberId*/)
+    void ItemBase::PutValue(const css::uno::Any& /*rVal*/, sal_uInt8 /*nMemberId*/)
     {
         // not intended to be used, error
-        assert(false && "Error: Some instance tries to set an Any at an ::Item instance where this is not supported - implement IBase::PutValue method there (!)");
+        assert(false && "Error: Some instance tries to set an Any at an ::Item instance where this is not supported - implement ItemBase::PutValue method there (!)");
     }
 
-    IBase::~IBase()
+    ItemBase::~ItemBase()
     {
     }
 
-    bool IBase::operator==(const IBase& rCmp) const
+    bool ItemBase::operator==(const ItemBase& rCmp) const
     {
         // basic implementation compares type, no data available
         return CheckSameType(rCmp);
     }
 
-    bool IBase::operator<(const IBase& rCmp) const
+    bool ItemBase::operator<(const ItemBase& rCmp) const
     {
         // basic implementation uses addresses of instances to
         // deliver a consistent result, but should *not* be used in
@@ -222,7 +222,7 @@ namespace Item
         return this < &rCmp;
     }
 
-    size_t IBase::GetUniqueKey() const
+    size_t ItemBase::GetUniqueKey() const
     {
         // basic implementation uses adress of instance as hash, to
         // deliver a consistent result, but should *not* be used in
@@ -230,13 +230,13 @@ namespace Item
         return static_cast<size_t>(sal_uInt64(this));
     }
 
-    bool IBase::IsDefault() const
+    bool ItemBase::IsDefault() const
     {
         // callback to static administrator
         return GetIAdministrator()->IsDefault(this);
     }
 
-    const IBase::SharedPtr& IBase::GetDefault() const
+    const ItemBase::SharedPtr& ItemBase::GetDefault() const
     {
         // callback to static administrator
         return GetIAdministrator()->GetDefault();
diff --git a/item/source/base/ISet.cxx b/item/source/base/ItemSet.cxx
index 9e5fae09d672..69022dbf23ba 100644
--- a/item/source/base/ISet.cxx
+++ b/item/source/base/ItemSet.cxx
@@ -8,47 +8,47 @@
  */
 
 #include <cassert>
-#include <item/base/ISet.hxx>
+#include <item/base/ItemSet.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace Item
 {
-    ISet::ISet(const ModelSpecificIValues::SharedPtr& rModelSpecificIValues)
-    :   std::enable_shared_from_this<ISet>(),
+    ItemSet::ItemSet(const ModelSpecificItemValues::SharedPtr& rModelSpecificIValues)
+    :   std::enable_shared_from_this<ItemSet>(),
         m_aParent(),
         m_aModelSpecificIValues(rModelSpecificIValues),
         m_aItems()
     {
     }
 
-    ISet::~ISet()
+    ItemSet::~ItemSet()
     {
     }
 
-    void ISet::SetParent(const ISet::SharedPtr& rNewParent)
+    void ItemSet::SetParent(const ItemSet::SharedPtr& rNewParent)
     {
         m_aParent = rNewParent;
     }
 
-    const ISet::SharedPtr& ISet::GetParent() const
+    const ItemSet::SharedPtr& ItemSet::GetParent() const
     {
         return m_aParent;
     }
 
-    ISet::SharedPtr ISet::Create(const ModelSpecificIValues::SharedPtr& rModelSpecificIValues)
+    ItemSet::SharedPtr ItemSet::Create(const ModelSpecificItemValues::SharedPtr& rModelSpecificIValues)
     {
-        return ISet::SharedPtr(new ISet(rModelSpecificIValues));
+        return ItemSet::SharedPtr(new ItemSet(rModelSpecificIValues));
     }
 
-    const ModelSpecificIValues::SharedPtr& ISet::GetModelSpecificIValues() const
+    const ModelSpecificItemValues::SharedPtr& ItemSet::GetModelSpecificIValues() const
     {
         return m_aModelSpecificIValues;
     }
 
-    void ISet::SetItem(const IBase::SharedPtr& rItem)
+    void ItemSet::SetItem(const ItemBase::SharedPtr& rItem)
     {
-        assert(rItem && "empty IBase::SharedPtr not allowed - and should be unable to be created (!)");
+        assert(rItem && "empty ItemBase::SharedPtr not allowed - and should be unable to be created (!)");
         bool bDefault(false);
 
         // detect if rItem is default item, include evtl. model-specific
@@ -56,7 +56,7 @@ namespace Item
         if(m_aModelSpecificIValues)
         {
             // may use model-specific default, get from helper
-            // helper *will* fallback to IBase default
+            // helper *will* fallback to ItemBase default
             bDefault = m_aModelSpecificIValues->IsDefault(rItem);
         }
         else
diff --git a/item/source/base/ModelSpecificIValues.cxx b/item/source/base/ModelSpecificItemValues.cxx
index 1720a2a0ace6..265649b0e9e3 100644
--- a/item/source/base/ModelSpecificIValues.cxx
+++ b/item/source/base/ModelSpecificItemValues.cxx
@@ -8,38 +8,38 @@
  */
 
 #include <cassert>
-#include <item/base/ModelSpecificIValues.hxx>
+#include <item/base/ModelSpecificItemValues.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace Item
 {
-    ModelSpecificIValues::ModelSpecificIValues()
-    :   std::enable_shared_from_this<ModelSpecificIValues>(),
+    ModelSpecificItemValues::ModelSpecificItemValues()
+    :   std::enable_shared_from_this<ModelSpecificItemValues>(),
         m_aAlternativeItems()
     {
     }
 
-    ModelSpecificIValues::~ModelSpecificIValues()
+    ModelSpecificItemValues::~ModelSpecificItemValues()
     {
     }
 
-    ModelSpecificIValues::SharedPtr ModelSpecificIValues::Create()
+    ModelSpecificItemValues::SharedPtr ModelSpecificItemValues::Create()
     {
-        return ModelSpecificIValues::SharedPtr(new ModelSpecificIValues());
+        return ModelSpecificItemValues::SharedPtr(new ModelSpecificItemValues());
     }
 
-    void ModelSpecificIValues::SetAlternativeDefaultItem(const IBase::SharedPtr& rItem)
+    void ModelSpecificItemValues::SetAlternativeDefaultItem(const ItemBase::SharedPtr& rItem)
     {
-        assert(rItem && "empty IBase::SharedPtr not allowed - and should be unable to be created (!)");
+        assert(rItem && "empty ItemBase::SharedPtr not allowed - and should be unable to be created (!)");
         const size_t hash_code(typeid(*rItem).hash_code());
 
         m_aAlternativeItems[hash_code] = rItem;
     }
 
-    bool ModelSpecificIValues::IsDefault(const IBase::SharedPtr& rItem) const
+    bool ModelSpecificItemValues::IsDefault(const ItemBase::SharedPtr& rItem) const
     {
-        assert(rItem && "empty IBase::SharedPtr not allowed - and should be unable to be created (!)");
+        assert(rItem && "empty ItemBase::SharedPtr not allowed - and should be unable to be created (!)");
 
         if(!m_aAlternativeItems.empty())
         {
@@ -57,9 +57,9 @@ namespace Item
         return rItem->IsDefault();
     }
 
-    const IBase::SharedPtr& ModelSpecificIValues::GetDefault(const IBase::SharedPtr& rItem) const
+    const ItemBase::SharedPtr& ModelSpecificItemValues::GetDefault(const ItemBase::SharedPtr& rItem) const
     {
-        assert(rItem && "empty IBase::SharedPtr not allowed - and should be unable to be created (!)");
+        assert(rItem && "empty ItemBase::SharedPtr not allowed - and should be unable to be created (!)");
 
         if(!m_aAlternativeItems.empty())
         {
diff --git a/item/source/base/SlotSet.cxx b/item/source/base/SlotSet.cxx
index 1acff3bdb1b2..e2ddda5a0013 100755
--- a/item/source/base/SlotSet.cxx
+++ b/item/source/base/SlotSet.cxx
@@ -29,9 +29,9 @@ namespace Item
         return SlotSet::SharedPtr(new SlotSet());
     }
 
-    void SlotSet::SetSlot(SlotID aSlotID, const IBase::SharedPtr& rItem)
+    void SlotSet::SetSlot(SlotID aSlotID, const ItemBase::SharedPtr& rItem)
     {
-        assert(rItem && "empty IBase::SharedPtr not allowed - and should be unable to be created (!)");
+        assert(rItem && "empty ItemBase::SharedPtr not allowed - and should be unable to be created (!)");
         m_aSlots[aSlotID] = rItem;
     }
 
diff --git a/item/source/simple/CntInt16.cxx b/item/source/simple/CntInt16.cxx
index 4ce2aa1bf198..ae4684a2d1c5 100644
--- a/item/source/simple/CntInt16.cxx
+++ b/item/source/simple/CntInt16.cxx
@@ -24,7 +24,7 @@ namespace Item
     {
         // needs to be called from here to have the fully derived implementation type
         // in the helper method - do NOT move to a imaginable general
-        // implementation in IBaseStaticHelper (!)
+        // implementation in ItemBaseStaticHelper (!)
         if(IsAdministrated())
         {
             GetStaticAdmin().HintExpired(this);
@@ -40,15 +40,15 @@ namespace Item
         return std::static_pointer_cast<const CntInt16>(GetStaticAdmin().Create(new CntInt16(nValue)));
     }
 
-    bool CntInt16::operator==(const IBase& rCandidate) const
+    bool CntInt16::operator==(const ItemBase& rCandidate) const
     {
-        assert(IBase::operator==(rCandidate));
+        assert(ItemBase::operator==(rCandidate));
         return (GetValue() == static_cast<const CntInt16&>(rCandidate).GetValue());
     }
 
-    bool CntInt16::operator<(const IBase& rCandidate) const
+    bool CntInt16::operator<(const ItemBase& rCandidate) const
     {
-        assert(IBase::operator==(rCandidate));
+        assert(ItemBase::operator==(rCandidate));
         return static_cast<const CntInt16*>(this)->GetValue() < static_cast<const CntInt16&>(rCandidate).GetValue();
     }
 
diff --git a/item/source/simple/CntOUString.cxx b/item/source/simple/CntOUString.cxx
index 4f7bbfea6d4f..b1028afdcaa7 100644
--- a/item/source/simple/CntOUString.cxx
+++ b/item/source/simple/CntOUString.cxx
@@ -24,7 +24,7 @@ namespace Item
     {
         // needs to be called from here to have the fully derived implementation type
         // in the helper method - do NOT move to a imaginable general
-        // implementation in IBaseStaticHelper (!)
+        // implementation in ItemBaseStaticHelper (!)
         if(IsAdministrated())
         {
             GetStaticAdmin().HintExpired(this);
@@ -40,9 +40,9 @@ namespace Item
         return std::static_pointer_cast<const CntOUString>(GetStaticAdmin().Create(new CntOUString(rValue)));
     }
 
-    bool CntOUString::operator==(const IBase& rCandidate) const
+    bool CntOUString::operator==(const ItemBase& rCandidate) const
     {
-        assert(IBase::operator==(rCandidate));
+        assert(ItemBase::operator==(rCandidate));
         return (GetValue() == static_cast<const CntOUString&>(rCandidate).GetValue());
     }
 
diff --git a/item/test/ItemTest.cxx b/item/test/ItemTest.cxx
index dadb34b2d504..539fe5491c19 100644
--- a/item/test/ItemTest.cxx
+++ b/item/test/ItemTest.cxx
@@ -12,10 +12,10 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
-#include <item/base/IBase.hxx>
-#include <item/base/IAdministrator.hxx>
-#include <item/base/ModelSpecificIValues.hxx>
-#include <item/base/ISet.hxx>
+#include <item/base/ItemBase.hxx>
+#include <item/base/ItemAdministrator.hxx>
+#include <item/base/ModelSpecificItemValues.hxx>
+#include <item/base/ItemSet.hxx>
 #include <item/simple/CntInt16.hxx>
 #include <item/simple/CntOUString.hxx>
 
@@ -23,11 +23,11 @@ namespace Item
 {
     // example for multi value Item
     class CntMultiValue;
-    typedef IBaseStaticHelper<CntMultiValue, IAdministrator_vector> CntMultiValueStaticHelper;
+    typedef ItemBaseStaticHelper<CntMultiValue, IAdministrator_vector> CntMultiValueStaticHelper;
 
     // if this should be based on faster IAdministrator_set, changes needed would be:
-    // - typedef IBaseStaticHelper<CntMultiValue, IAdministrator_set> CntMultiValueStaticHelper;
-    // - define virtual bool operator<(const IBase& rCandidate) const override
+    // - typedef ItemBaseStaticHelper<CntMultiValue, IAdministrator_set> CntMultiValueStaticHelper;
+    // - define virtual bool operator<(const ItemBase& rCandidate) const override
 
     class CntMultiValue : public CntMultiValueStaticHelper
     {
@@ -52,7 +52,7 @@ namespace Item
         {
             // needs to be called from here to have the fully derived implementation type
             // in the helper method - do NOT move to a imaginable general
-            // implementation in IBaseStaticHelper (!)
+            // implementation in ItemBaseStaticHelper (!)
             if(IsAdministrated())
             {
                 GetStaticAdmin().HintExpired(this);
@@ -68,9 +68,9 @@ namespace Item
             return std::static_pointer_cast<const CntMultiValue>(GetStaticAdmin().Create(new CntMultiValue(nValueA, nValueB, nValueC)));
         }
 
-        virtual bool operator==(const IBase& rCandidate) const override
+        virtual bool operator==(const ItemBase& rCandidate) const override
         {
-            assert(IBase::operator==(rCandidate));
+            assert(ItemBase::operator==(rCandidate));
             const CntMultiValue& rCand(static_cast<const CntMultiValue&>(rCandidate));
             return (GetValueA() == rCand.GetValueA()
                 && GetValueB() == rCand.GetValueB()
@@ -92,9 +92,9 @@ namespace Item
             return m_nValueC;
         }
 
-        // virtual bool operator<(const IBase& rCandidate) const override
+        // virtual bool operator<(const ItemBase& rCandidate) const override
         // {
-        //     assert(IBase::operator==(rCandidate));
+        //     assert(ItemBase::operator==(rCandidate));
         //     return static_cast<const CntMultiValue*>(this)->GetValueA() < static_cast<const CntMultiValue&>(rCandidate).GetValueA()
         //         && static_cast<const CntMultiValue*>(this)->GetValueB() < static_cast<const CntMultiValue&>(rCandidate).GetValueB()
         //         && static_cast<const CntMultiValue*>(this)->GetValueC() < static_cast<const CntMultiValue&>(rCandidate).GetValueC();
@@ -180,14 +180,14 @@ namespace Item
         {
             int nIncrement(0);
 
-            // make use of local CntMultiValue item in conjuction with ISet
-            ModelSpecificIValues::SharedPtr aModelSpecificIValues(ModelSpecificIValues::Create());
-            ISet::SharedPtr aSet(ISet::Create(aModelSpecificIValues));
+            // make use of local CntMultiValue item in conjuction with ItemSet
+            ModelSpecificItemValues::SharedPtr aModelSpecificIValues(ModelSpecificItemValues::Create());
+            ItemSet::SharedPtr aSet(ItemSet::Create(aModelSpecificIValues));
             aSet->SetItem(CntMultiValue::Create(5,4,3));
 
             if(const auto Item(aSet->GetStateAndItem<const CntMultiValue>()); Item.IsSet())
             {
-                nIncrement += (ISet::IState::SET == Item.GetIState()) ? 1 : 0;
+                nIncrement += (ItemSet::IState::SET == Item.GetIState()) ? 1 : 0;
                 nIncrement += (Item.GetItem()) ? 1 : 0;
                 nIncrement += (nullptr != Item.GetItemInstance()) ? 1 : 0;
                 nIncrement += Item.HasItem();
@@ -310,11 +310,11 @@ namespace Item
         {
             int nIncrement(0);
 
-            ModelSpecificIValues::SharedPtr aModelSpecificIValues(ModelSpecificIValues::Create());
+            ModelSpecificItemValues::SharedPtr aModelSpecificIValues(ModelSpecificItemValues::Create());
             aModelSpecificIValues->SetAlternativeDefaultItem(CntInt16::Create(3));
             aModelSpecificIValues->SetAlternativeDefaultItem(CntInt16::Create(4));
 
-            ISet::SharedPtr aSet(ISet::Create(aModelSpecificIValues));
+            ItemSet::SharedPtr aSet(ItemSet::Create(aModelSpecificIValues));
             const auto aActEmpty(aSet->GetStateAndItem<const CntInt16>());
 
             aSet->SetItem(CntInt16::Create(4));
@@ -333,7 +333,7 @@ namespace Item
 
             if(const auto Item(aSet->GetStateAndItem<const CntOUString>()); Item.IsSet())
             {
-                nIncrement += (ISet::IState::SET == Item.GetIState()) ? 1 : 0;
+                nIncrement += (ItemSet::IState::SET == Item.GetIState()) ? 1 : 0;
                 nIncrement += (Item.GetItem()) ? 1 : 0;
                 nIncrement += (nullptr != Item.GetItemInstance()) ? 1 : 0;
                 nIncrement += Item.HasItem();
@@ -352,7 +352,7 @@ namespace Item
                 nIncrement += Item.IsDisabled();
             }
 
-            // check getting default at Set, this will include ModelSpecificIValues
+            // check getting default at Set, this will include ModelSpecificItemValues
             // compared with the static CntInt16::GetDefault() call
             const CntInt16::SharedPtr aDefSet(aSet->GetDefault<const CntInt16>());
             const CntInt16::SharedPtr aDefGlobal(CntInt16::GetDefault());
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index 33a33eb308b7..6b2450ec8275 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -140,7 +140,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
             Sequence< PropertyValue > aSeq;
             if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 2 )
             {
-                const Item::IBase::SharedPtr aSlotItem;
+                const Item::ItemBase::SharedPtr aSlotItem;
                 SvxZoomSliderItem aZoomSlider(100,20,400);
                 aZoomSlider.PutValue(_aEvent.State, 0);
                 static_cast<SvxZoomSliderControl*>(m_rController.get())->StateChanged(m_nSlotId,SfxItemState::DEFAULT,&aZoomSlider,aSlotItem);
@@ -151,7 +151,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
             Sequence< PropertyValue > aSeq;
             if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 3 )
             {
-                const Item::IBase::SharedPtr aSlotItem;
+                const Item::ItemBase::SharedPtr aSlotItem;
                 SvxZoomItem aZoom;
                 aZoom.PutValue(_aEvent.State, 0 );
                 static_cast<SvxZoomStatusBarControl*>(m_rController.get())->StateChanged(m_nSlotId,SfxItemState::DEFAULT,&aZoom,aSlotItem);
diff --git a/sc/inc/NumberFormatControl.hxx b/sc/inc/NumberFormatControl.hxx
index 0aed56399463..b7d992bc4f9a 100644
--- a/sc/inc/NumberFormatControl.hxx
+++ b/sc/inc/NumberFormatControl.hxx
@@ -34,7 +34,7 @@ public:
     virtual ~ScNumberFormatControl() override;
 
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
 };
 
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 81df1a63c143..8b65dd664d9e 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -49,7 +49,7 @@ ScZoomSliderControl::~ScZoomSliderControl()
 }
 
 void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState,
-                                       const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                       const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     sal_uInt16                  nId  = GetId();
     ToolBox&                rTbx = GetToolBox();
diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx
index b4d81f04124f..150ccdfabafb 100644
--- a/sc/source/ui/inc/navcitem.hxx
+++ b/sc/source/ui/inc/navcitem.hxx
@@ -32,7 +32,7 @@ public:
                                SfxBindings& rBindings );
 protected:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                      const SfxPoolItem* pItem, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                      const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 private:
     ScNavigatorDlg& rNavigatorDlg;
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index 62fb0a4adfc8..4e815f9e5a70 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -34,7 +34,7 @@ public:
     ScZoomSliderControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~ScZoomSliderControl() override;
 
-    virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
 };
 
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index 90b0f833e9d9..af9b96e5e5ec 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -34,7 +34,7 @@ ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16          nIdP,
 }
 
 void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemState /* eState */,
-                                                          const SfxPoolItem* pItem, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                                          const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     switch( GetId() )
     {
diff --git a/sc/source/ui/sidebar/NumberFormatControl.cxx b/sc/source/ui/sidebar/NumberFormatControl.cxx
index 0b4e9a40127a..e7599c3c205f 100644
--- a/sc/source/ui/sidebar/NumberFormatControl.cxx
+++ b/sc/source/ui/sidebar/NumberFormatControl.cxx
@@ -36,7 +36,7 @@ ScNumberFormatControl::~ScNumberFormatControl()
 }
 
 void ScNumberFormatControl::StateChanged(sal_uInt16, SfxItemState eState,
-                                         const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+                                         const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index b53ce55f498e..cdeb2ac0e211 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -76,7 +76,7 @@ SdTemplateControl::~SdTemplateControl()
 }
 
 void SdTemplateControl::StateChanged(
-    sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+    sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if( eState != SfxItemState::DEFAULT || pState->IsVoidItem() )
         GetStatusBar().SetItemText( GetId(), OUString() );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 0caa389b87a7..8ea49bbacf62 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -1112,7 +1112,7 @@ AnimationControllerItem::AnimationControllerItem(
 }
 
 void AnimationControllerItem::StateChanged( sal_uInt16 nSId,
-                        SfxItemState eState, const SfxPoolItem* pItem, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                        SfxItemState eState, const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if( eState >= SfxItemState::DEFAULT && nSId == SID_ANIMATOR_STATE )
     {
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index c2c2fab20770..91a9078efc23 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -102,7 +102,7 @@ SdTbxCtlDiaPages::~SdTbxCtlDiaPages()
 }
 
 void SdTbxCtlDiaPages::StateChanged( sal_uInt16,
-                SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     SdPagesField* pFld = static_cast<SdPagesField*>( GetToolBox().GetItemWindow( GetId() ) );
     DBG_ASSERT( pFld, "Window not found" );
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index da95f9f0462b..026b14fe3ca2 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -118,7 +118,7 @@ SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir(
  * Represents state in the listbox of the controller
  */
 void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId,
-                        SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem )
+                        SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem )
 {
     if( eState == SfxItemState::DEFAULT )
     {
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index ddf172b76be0..0f6c38736fa9 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -780,7 +780,7 @@ SdNavigatorControllerItem::SdNavigatorControllerItem(
 }
 
 void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
-                        SfxItemState eState, const SfxPoolItem* pItem, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                        SfxItemState eState, const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if( !(eState >= SfxItemState::DEFAULT && nSId == SID_NAVIGATOR_STATE) )
         return;
@@ -851,7 +851,7 @@ SdPageNameControllerItem::SdPageNameControllerItem(
 }
 
 void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
-                        SfxItemState eState, const SfxPoolItem* pItem, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                        SfxItemState eState, const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if( !(eState >= SfxItemState::DEFAULT && nSId == SID_NAVIGATOR_PAGENAME) )
         return;
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index c6b4df16cc05..94b7f72ce788 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -154,7 +154,7 @@ public:
 
 protected:
     virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
-        const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+        const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 private:
     VclPtr<AnimationWindow> pAnimationWin;
 };
diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx
index 76283cbda5b8..463d9f0a6ea4 100644
--- a/sd/source/ui/inc/diactrl.hxx
+++ b/sd/source/ui/inc/diactrl.hxx
@@ -49,7 +49,7 @@ class SdTbxCtlDiaPages : public SfxToolBoxControl
 {
 public:
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                      const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                      const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
 
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx
index 4aad81b94ea2..581b2282f5b5 100644
--- a/sd/source/ui/inc/gluectrl.hxx
+++ b/sd/source/ui/inc/gluectrl.hxx
@@ -52,7 +52,7 @@ private:
 
 public:
     virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
-                                const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
 
             SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 49722bf0d39c..0f92e36f1486 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -159,7 +159,7 @@ public:
 
 protected:
     virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
-                                const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 private:
     VclPtr<SdNavigatorWin> pNavigatorWin;
@@ -176,7 +176,7 @@ public:
 
 protected:
     virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
-                                const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 private:
     VclPtr<SdNavigatorWin> pNavigatorWin;
diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx
index 9e079cc6c262..f78196652d30 100644
--- a/sd/source/ui/inc/tmplctrl.hxx
+++ b/sd/source/ui/inc/tmplctrl.hxx
@@ -27,7 +27,7 @@ public:
     SdTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
     virtual ~SdTemplateControl() override;
 
-    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void    Paint( const UserDrawEvent& rEvt ) override;
 
     SFX_DECL_STATUSBAR_CONTROL();
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 11dd49518282..7110070cdf93 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -42,7 +42,7 @@ class RulerCtrlItem : public SfxControllerItem
 
  protected:
     virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
-                                const SfxPoolItem* pItem, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
  public:
     RulerCtrlItem(Ruler& rRlr, SfxBindings& rBind);
@@ -54,7 +54,7 @@ RulerCtrlItem::RulerCtrlItem(Ruler& rRlr, SfxBindings& rBind)
 {
 }
 
-void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     switch( nSId )
     {
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 0b3967fb7fa6..8edcc163a670 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -54,7 +54,7 @@ public:
     virtual                 ~SfxURLToolBoxControl_Impl() override;
 
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override;
-    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 };
 
 #endif
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index aa69acc19e09..3292c95db217 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -237,9 +237,9 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
             }
             else
             {
-                Item::IBase::AnyIDArgs aArgs;
-                aArgs.push_back(Item::IBase::AnyIDPair(rProp.Value, bConvertTwips ? CONVERT_TWIPS : 0));
-                Item::IBase::SharedPtr aSlotItem(pType->CreateSlotItem(aArgs));
+                Item::ItemBase::AnyIDArgs aArgs;
+                aArgs.push_back(Item::ItemBase::AnyIDPair(rProp.Value, bConvertTwips ? CONVERT_TWIPS : 0));
+                Item::ItemBase::SharedPtr aSlotItem(pType->CreateSlotItem(aArgs));
                 if(aSlotItem)
                 {
                     rSet.slotSet().SetSlot(nWhich, aSlotItem);
@@ -272,7 +272,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
 #endif
             // complex property; collect sub items from the parameter set and reconstruct complex item
             sal_uInt16 nFound=0;
-            Item::IBase::AnyIDArgs aArgs;
+            Item::ItemBase::AnyIDArgs aArgs;
 
             for ( sal_Int32 n=0; n<nCount; n++ )
             {
@@ -304,7 +304,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
                         }
                         else
                         {
-                            aArgs.push_back(Item::IBase::AnyIDPair(rPropValue.Value, nSubId));
+                            aArgs.push_back(Item::ItemBase::AnyIDPair(rPropValue.Value, nSubId));
                             nFound++;
                         }
                         break;
@@ -324,7 +324,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
                 }
                 else
                 {
-                    Item::IBase::SharedPtr aSlotItem(pType->CreateSlotItem(aArgs));
+                    Item::ItemBase::SharedPtr aSlotItem(pType->CreateSlotItem(aArgs));
                     if(aSlotItem)
                     {
                         rSet.slotSet().SetSlot(nWhich, aSlotItem);
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index f6339243b333..013b26502af5 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1041,8 +1041,8 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
                 {
                     // I2TM will have to use as soon as SfxBoolItem gets used and/or
                     // SfxPoolItem's with 'SfxEnumItemInterface' (?!?)
-                    //  Item::IBase::AnyIDArgs aArgs;
-                    //  Item::IBase::SharedPtr aSlotItem(pSlot->GetType()->CreateSlotItem(aArgs));
+                    //  Item::ItemBase::AnyIDArgs aArgs;
+                    //  Item::ItemBase::SharedPtr aSlotItem(pSlot->GetType()->CreateSlotItem(aArgs));
                 }
                 else
                 {
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index c35aaa1e2272..f880dccf35bf 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -212,7 +212,7 @@ void SfxControllerItem::StateChanged
     sal_uInt16,          // <SID> of the triggering slot
     SfxItemState,       // <SfxItemState> of 'pState'
     const SfxPoolItem*,  // Slot-Status, NULL or IsInvalidItem()
-    const Item::IBase::SharedPtr& /*rSlotItem*/
+    const Item::ItemBase::SharedPtr& /*rSlotItem*/
 )
 
 /*  [Description]
@@ -241,7 +241,7 @@ void SfxStatusForwarder::StateChanged
     sal_uInt16          nSID,    // <SID> of the triggering slot
     SfxItemState        eState,  // <SfxItemState> of 'pState'
     const SfxPoolItem*  pState,   // Slot-Status, NULL or IsInvalidItem()
-    const Item::IBase::SharedPtr& rSlotItem
+    const Item::ItemBase::SharedPtr& rSlotItem
 )
 
 {
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 950814dcd386..159255eb003d 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -65,7 +65,7 @@ SfxStatusListener::~SfxStatusListener()
 }
 
 // old sfx controller item C++ API
-void SfxStatusListener::StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem*, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SfxStatusListener::StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem*, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     // must be implemented by sub class
 }
@@ -162,7 +162,7 @@ void SAL_CALL SfxStatusListener::statusChanged( const FeatureStateEvent& rEvent)
 
     SfxItemState eState = SfxItemState::DISABLED;
     std::unique_ptr<SfxPoolItem> pItem;
-    Item::IBase::SharedPtr aSlotItem;
+    Item::ItemBase::SharedPtr aSlotItem;
 
     if ( rEvent.IsEnabled )
     {
@@ -219,8 +219,8 @@ void SAL_CALL SfxStatusListener::statusChanged( const FeatureStateEvent& rEvent)
 
                 if(bSlotItem)
                 {
-                    Item::IBase::AnyIDArgs aArgs;
-                    aArgs.push_back(Item::IBase::AnyIDPair(rEvent.State, 0));
+                    Item::ItemBase::AnyIDArgs aArgs;
+                    aArgs.push_back(Item::ItemBase::AnyIDPair(rEvent.State, 0));
                     aSlotItem = pSlot->GetType()->CreateSlotItem(aArgs);
                 }
                 else
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index c7563c4b6545..bc5f380f71f3 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -79,7 +79,7 @@ void SAL_CALL  BindDispatch_Impl::statusChanged( const css::frame::FeatureStateE
     else
     {
         std::unique_ptr<SfxPoolItem> pItem;
-        Item::IBase::SharedPtr aSlotItem;
+        Item::ItemBase::SharedPtr aSlotItem;
         sal_uInt16 nId = pCache->GetId();
         SfxItemState eState = SfxItemState::DISABLED;
         if ( !aStatus.IsEnabled )
@@ -124,8 +124,8 @@ void SAL_CALL  BindDispatch_Impl::statusChanged( const css::frame::FeatureStateE
 
                     if(bSlotItem)
                     {
-                        Item::IBase::AnyIDArgs aArgs;
-                        aArgs.push_back(Item::IBase::AnyIDPair(rEvent.State, 0));
+                        Item::ItemBase::AnyIDArgs aArgs;
+                        aArgs.push_back(Item::ItemBase::AnyIDPair(rEvent.State, 0));
                         aSlotItem = pSlot->GetType()->CreateSlotItem(aArgs);
                     }
                     else
@@ -375,7 +375,7 @@ void SfxStateCache::SetVisibleState( bool bShow )
     // Update Controller
     if ( !mxDispatch.is() && pController )
     {
-        const Item::IBase::SharedPtr aSlotItem;
+        const Item::ItemBase::SharedPtr aSlotItem;
         for ( SfxControllerItem *pCtrl = pController;
                 pCtrl;
                 pCtrl = pCtrl->GetItemLink() )
@@ -384,7 +384,7 @@ void SfxStateCache::SetVisibleState( bool bShow )
 
     if ( pInternalController )
     {
-        const Item::IBase::SharedPtr aSlotItem;
+        const Item::ItemBase::SharedPtr aSlotItem;
         pInternalController->StateChanged( nId, eState, pState, aSlotItem );
     }
 
@@ -427,7 +427,7 @@ void SfxStateCache::SetState_Impl
         // Update Controller
         if ( !mxDispatch.is() && pController )
         {
-            const Item::IBase::SharedPtr aSlotItem;
+            const Item::ItemBase::SharedPtr aSlotItem;
             for ( SfxControllerItem *pCtrl = pController;
                 pCtrl;
                 pCtrl = pCtrl->GetItemLink() )
@@ -467,7 +467,7 @@ void SfxStateCache::SetCachedState( bool bAlways )
     // Update Controller
     if ( !mxDispatch.is() && pController )
     {
-        const Item::IBase::SharedPtr aSlotItem;
+        const Item::ItemBase::SharedPtr aSlotItem;
         for ( SfxControllerItem *pCtrl = pController;
             pCtrl;
             pCtrl = pCtrl->GetItemLink() )
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e017f23eab26..f805bcfde0d6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -782,7 +782,7 @@ void SfxDispatchController_Impl::dispatch( const css::util::URL& aURL,
                 if ( pAppDispat )
                 {
                     const SfxPoolItem* pState=nullptr;
-                    const Item::IBase::SharedPtr aSlotItem;
+                    const Item::ItemBase::SharedPtr aSlotItem;
                     SfxItemState eState = pDispatcher->QueryState( GetId(), pState );
                     StateChanged( GetId(), eState, pState, aSlotItem );
                 }
@@ -967,7 +967,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
     }
 }
 
-void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     StateChanged( nSID, eState, pState, nullptr );
 }
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 47765b9d7cfd..eae37c189b2a 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -53,7 +53,7 @@ SfxTemplateControllerItem::~SfxTemplateControllerItem()
 // passed on by the constructor
 
 void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                              const SfxPoolItem* pItem, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                              const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     switch(nSID)
     {
diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx
index 600647490d3b..c5de24734594 100644
--- a/sfx2/source/inc/tplcitem.hxx
+++ b/sfx2/source/inc/tplcitem.hxx
@@ -32,7 +32,7 @@ class SfxTemplateControllerItem : public SfxControllerItem {
     DECL_LINK(SetWaterCanStateHdl_Impl, void*, void);
 
 protected:
-    virtual void StateChanged(sal_uInt16, SfxItemState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+    virtual void StateChanged(sal_uInt16, SfxItemState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
 
 public:
     SfxTemplateControllerItem(sal_uInt16 nId, SfxCommonTemplateDialog_Impl& rDialog, SfxBindings& rBindings);
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 22f288200ec0..e6054434514e 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -183,7 +183,7 @@ void SfxURLToolBoxControl_Impl::StateChanged
 (
     sal_uInt16              nSID,
     SfxItemState        eState,
-    const SfxPoolItem*  pState, const Item::IBase::SharedPtr& /*rSlotItem*/
+    const SfxPoolItem*  pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/
 )
 {
     if ( nSID == SID_OPENURL )
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 58f7383dfa39..5422faab0d2d 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -62,7 +62,7 @@ void ControllerItem::dispose()
 void ControllerItem::StateChanged (
     sal_uInt16 nSID,
     SfxItemState eState,
-    const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+    const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     mrItemUpdateReceiver.NotifyItemUpdate(nSID, eState, pState, IsEnabled(eState));
 }
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 333edbabe0c6..fed800b5ef25 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -229,7 +229,7 @@ void SAL_CALL SfxStatusBarControl::statusChanged( const frame::FeatureStateEvent
     {
         SfxItemState eState = SfxItemState::DISABLED;
         std::unique_ptr<SfxPoolItem> pItem;
-        Item::IBase::SharedPtr aSlotItem;
+        Item::ItemBase::SharedPtr aSlotItem;
         if ( rEvent.IsEnabled )
         {
             eState = SfxItemState::DEFAULT;
@@ -279,8 +279,8 @@ void SAL_CALL SfxStatusBarControl::statusChanged( const frame::FeatureStateEvent
 
                     if(bSlotItem)
                     {
-                        Item::IBase::AnyIDArgs aArgs;
-                        aArgs.push_back(Item::IBase::AnyIDPair(rEvent.State, 0));
+                        Item::ItemBase::AnyIDArgs aArgs;
+                        aArgs.push_back(Item::ItemBase::AnyIDPair(rEvent.State, 0));
                         aSlotItem = pSlot->GetType()->CreateSlotItem(aArgs);
                     }
                     else
@@ -404,7 +404,7 @@ void SfxStatusBarControl::StateChanged
 (
     sal_uInt16              nSID,
     SfxItemState        eState,
-    const SfxPoolItem*  pState, const Item::IBase::SharedPtr& /*rSlotItem*/  /* Pointer to SfxPoolItem, is only valid
+    const SfxPoolItem*  pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/  /* Pointer to SfxPoolItem, is only valid
                                    within this Method call. This can be a
                                    Null-Pointer, a Pointer to SfxVoidItem
                                    or of this Type found registered by the
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 2a69b2d0bf80..2566be890798 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -453,7 +453,7 @@ void SAL_CALL SfxToolBoxControl::statusChanged( const FeatureStateEvent& rEvent
     {
         SfxItemState eState = SfxItemState::DISABLED;
         std::unique_ptr<SfxPoolItem> pItem;
-        Item::IBase::SharedPtr aSlotItem;
+        Item::ItemBase::SharedPtr aSlotItem;
         if ( rEvent.IsEnabled )
         {
             eState = SfxItemState::DEFAULT;
@@ -515,8 +515,8 @@ void SAL_CALL SfxToolBoxControl::statusChanged( const FeatureStateEvent& rEvent
 
                     if(bSlotItem)
                     {
-                        Item::IBase::AnyIDArgs aArgs;
-                        aArgs.push_back(Item::IBase::AnyIDPair(rEvent.State, 0));
+                        Item::ItemBase::AnyIDArgs aArgs;
+                        aArgs.push_back(Item::ItemBase::AnyIDPair(rEvent.State, 0));
                         aSlotItem = pSlot->GetType()->CreateSlotItem(aArgs);
                     }
                     else
@@ -619,7 +619,7 @@ void SfxToolBoxControl::StateChanged
 (
     sal_uInt16              nId,
     SfxItemState        eState,
-    const SfxPoolItem*  pState, const Item::IBase::SharedPtr& /*rSlotItem*/
+    const SfxPoolItem*  pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/
 )
 {
     DBG_ASSERT( pImpl->pBox != nullptr, "setting state to dangling ToolBox" );
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 55969a5cfffb..2b13eab57116 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -345,7 +345,7 @@ void SfxViewFrame::INetExecute_Impl( SfxRequest &rRequest )
                 SfxControllerItem* pCtrl = pCache->GetItemLink();
                 while( pCtrl )
                 {
-                    const Item::IBase::SharedPtr aSlotItem;
+                    const Item::ItemBase::SharedPtr aSlotItem;
                     pCtrl->StateChanged( SID_FOCUSURLBOX, SfxItemState::UNKNOWN, nullptr, aSlotItem );
                     pCtrl = pCtrl->GetItemLink();
                 }
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index dfd2b0c7af59..a43f79b5e748 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -138,7 +138,7 @@ public:
     SmGraphicController(SmGraphicWindow &, sal_uInt16, SfxBindings & );
     virtual void StateChanged(sal_uInt16             nSID,
                               SfxItemState       eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
 };
 
 class SmEditController final : public SfxControllerItem
@@ -148,7 +148,7 @@ class SmEditController final : public SfxControllerItem
 public:
     SmEditController(SmEditWindow &, sal_uInt16, SfxBindings  & );
 
-    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
 };
 
 class SmCmdBoxWindow : public SfxDockingWindow
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 7501b0100ff3..3d3e20be4dd5 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -632,7 +632,7 @@ SmGraphicController::SmGraphicController(SmGraphicWindow &rSmGraphic,
 }
 
 
-void SmGraphicController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem)
+void SmGraphicController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem)
 {
     rGraphic.SetTotalSize();
     rGraphic.Invalidate();
@@ -653,7 +653,7 @@ SmEditController::SmEditController(SmEditWindow &rSmEdit,
 
 
 
-void SmEditController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem)
+void SmEditController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem)
 {
     const SfxStringItem *pItem =  dynamic_cast<const SfxStringItem*>( pState);
 
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 677ae90b2f35..8463ac77c3f0 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -935,15 +935,15 @@ void SfxItemPool::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-// I2TM Transfer phase: deliver ModelSpecificIValues for this SfxItemPool/Model
-Item::ModelSpecificIValues::SharedPtr SfxItemPool::getModelSpecificIValues() const
+// I2TM Transfer phase: deliver ModelSpecificItemValues for this SfxItemPool/Model
+Item::ModelSpecificItemValues::SharedPtr SfxItemPool::getModelSpecificIValues() const
 {
     // global static instance fallback for all SfxItemPool(s)
-    static Item::ModelSpecificIValues::SharedPtr aGlobalDefault;
+    static Item::ModelSpecificItemValues::SharedPtr aGlobalDefault;
 
     if(!aGlobalDefault)
     {
-        aGlobalDefault = Item::ModelSpecificIValues::Create();
+        aGlobalDefault = Item::ModelSpecificItemValues::Create();
     }
 
     return aGlobalDefault;
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index c7ef9ef6aa5b..8dadb3e31ce2 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -327,7 +327,7 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( SvxBmpMask& rMask,
 }
 
 void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
-                                         const SfxPoolItem* pItem, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                         const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if ( ( nSID == SID_BMPMASK_EXEC ) && pItem )
     {
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index e97f2cd6fca6..8e8f425fa2bf 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -51,7 +51,7 @@ SvxContourDlgItem::SvxContourDlgItem( SvxSuperContourDlg& rContourDlg, SfxBindin
 {
 }
 
-void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if ( pItem && ( SID_CONTOUR_EXEC == nSID ) )
     {
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 93b13e727c83..b7b968ca5d48 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -33,7 +33,7 @@ class SvxContourDlgItem : public SfxControllerItem
 
 protected:
 
-    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 public:
 
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 5316bc8c6026..fda64c358fa9 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -65,7 +65,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem
 // StateChanged method for FontWork items
 
 void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/,
-                                              const SfxPoolItem* pItem, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                              const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     switch ( GetId() )
     {
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 90fda0323b3c..ef7eb73d7dfb 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -73,7 +73,7 @@ SvxIMapDlgItem::SvxIMapDlgItem( SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :
 }
 
 void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
-                                   const SfxPoolItem* pItem, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                   const SfxPoolItem* pItem, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if ( ( nSID == SID_IMAP_EXEC ) && pItem )
     {
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 1a6937e74401..20daac916fec 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -40,7 +40,7 @@ SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindin
 
 
 void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                 const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+                                 const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     // SfxItemState::DONTCARE => pState == -1 => PTR_CAST buff
     if ( eState != SfxItemState::DEFAULT )
diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx
index f374933e00d6..05056f173956 100644
--- a/svx/source/dialog/rlrcitem.hxx
+++ b/svx/source/dialog/rlrcitem.hxx
@@ -30,7 +30,7 @@ private:
 
 protected:
     virtual void StateChanged( sal_uInt16,
-                               SfxItemState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                               SfxItemState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 public:
     SvxRulerItem( sal_uInt16 nId, SvxRuler&, SfxBindings& );
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 3f0cfeedb150..57651fc6ec1d 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -40,7 +40,7 @@ SvxSearchController::SvxSearchController
 
 
 void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                        const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                        const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if ( SfxItemState::DEFAULT == eState )
     {
diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx
index abcef083fe22..5c5e43361980 100644
--- a/svx/source/dialog/srchctrl.hxx
+++ b/svx/source/dialog/srchctrl.hxx
@@ -27,7 +27,7 @@ class SvxSearchController : public SfxControllerItem
     SvxSearchDialog&    rSrchDlg;
 
 protected:
-    virtual void        StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void        StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 public:
     SvxSearchController( sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg );
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 0fe395c1b8a8..53cc19cf839d 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2924,7 +2924,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId,
 
 
 void Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/,
-                        SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                        SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
 }
 
@@ -2936,7 +2936,7 @@ SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings)
 {
 }
 
-void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     bool bNewState = (eState != SfxItemState::DISABLED);
     if(bNewState != bState)
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 09b8843414e3..848eb60fb76b 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2202,7 +2202,7 @@ namespace svxform
         SfxDockingWindow::dispose();
     }
 
-    void DataNavigator::StateChanged( sal_uInt16 , SfxItemState , const SfxPoolItem*, const Item::IBase::SharedPtr& /*rSlotItem*/)
+    void DataNavigator::StateChanged( sal_uInt16 , SfxItemState , const SfxPoolItem*, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
     {
     }
 
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index d2a32b62a21d..1487bd3a3f43 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1822,7 +1822,7 @@ void FmFilterNavigatorWin::UpdateContent(FmFormShell const * pFormShell)
 }
 
 
-void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if( !pState  || SID_FM_FILTER_NAVIGATOR_CONTROL != nSID )
         return;
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 4033ad256ff7..45a561d8a3a7 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -617,7 +617,7 @@ void FmPropBrw::impl_ensurePropertyBrowser_nothrow( FmFormShell* _pFormShell )
 }
 
 
-void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if (!pState  || SID_FM_PROPERTY_CONTROL != nSID)
         return;
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 7fedf36dce0f..95651da2114c 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -488,7 +488,7 @@ namespace svxform
     }
 
 
-    void NavigatorFrame::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+    void NavigatorFrame::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
     {
         if( !pState  || SID_FM_FMEXPLORER_CONTROL != nSID )
             return;
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 6887f3c6917e..bb64522c5f86 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -265,7 +265,7 @@ void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt)
 }
 
 
-void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if (!pState  || SID_FM_FIELDS_CONTROL != nSID)
         return;
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 0e599b9fe620..a9f0d5f1e7b8 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -108,7 +108,7 @@ SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec()
 }
 
 
-void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem)
+void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem)
 {
     sal_uInt16              nId = GetId();
     ToolBox*            pToolBox = &GetToolBox();
@@ -215,7 +215,7 @@ VclPtr<vcl::Window> SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pParent
 }
 
 
-void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem)
+void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem)
 {
 
     // setting the FixedText
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index e2550374bbfb..45784848ba6c 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -367,7 +367,7 @@ namespace svxform
         using                       SfxDockingWindow::StateChanged;
 
         void                        StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     };
 
     class SVX_DLLPUBLIC DataNavigatorManager : public SfxChildWindow
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 20f7c28778ed..bc3b0890f984 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -315,7 +315,7 @@ public:
     virtual void dispose() override;
 
     void UpdateContent( FmFormShell const * pFormShell );
-    void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     void FillInfo( SfxChildWinInfo& rInfo ) const override;
 
     using SfxDockingWindow::StateChanged;
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 638fd11af240..3077dc6629b2 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -61,7 +61,7 @@ class FmPropBrw final : public SfxFloatingWindow, public SfxControllerItem
     css::uno::Reference< css::awt::XWindow >
                     m_xFrameContainerWindow;
 
-    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
     virtual void FillInfo( SfxChildWinInfo& rInfo ) const override;
     virtual bool Close() override;
 
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index f4bb12296406..14fd856d9139 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -529,7 +529,7 @@ namespace svxform
         virtual void dispose() override;
 
         void UpdateContent( FmFormShell* pFormShell );
-        void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+        void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
         void FillInfo( SfxChildWinInfo& rInfo ) const override;
     };
 
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 2cbd9970ac5e..c4f040848487 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -87,7 +87,7 @@ public:
     virtual void GetFocus() override;
     virtual bool PreNotify( NotifyEvent& _rNEvt ) override;
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem) override;
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem) override;
 
     void UpdateContent(FmFormShell const *);
     void UpdateContent(const css::uno::Reference< css::form::XForm > &);
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index 759cb71d0e1c..bfa09a67471e 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -50,7 +50,7 @@ public:
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override;
 
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 };
 
 
@@ -90,7 +90,7 @@ public:
 
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override;
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 };
 
 
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index cb89552b096f..b2e756dc236c 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -106,7 +106,7 @@ VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
 }
 
 
-void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID )
     {
diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
index 5c7764fbb421..2c40a11fede0 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
@@ -51,7 +51,7 @@ ParaULSpacingControl::~ParaULSpacingControl()
 }
 
 void ParaULSpacingControl::StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
@@ -132,7 +132,7 @@ void SAL_CALL ParaLRSpacingControl::dispose()
 }
 
 void ParaLRSpacingControl::StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index c8316a9d2f27..593f9d438973 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -44,7 +44,7 @@ SvxInsertStatusBarControl::~SvxInsertStatusBarControl()
 }
 
 void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if ( SfxItemState::DEFAULT != eState )
         GetStatusBar().SetItemText( GetId(), "" );
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 4fec63c59be4..5d1999cc2336 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -75,7 +75,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status
 
 
 void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
-                                     const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                     const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if ( SfxItemState::DEFAULT != eState )
         return;
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 4c103bb2f619..e0650aeb9463 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -261,7 +261,7 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
 */
 
 void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                               const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                               const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     // Because the combi-controller, always sets the current Id as HelpId
     // first clean the cached HelpText
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 248ae715d3e1..ed05639ce58a 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -90,7 +90,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
 }
 
 void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
-                                            const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                            const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if ( SfxItemState::DEFAULT == eState )
     {
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 1386f6e1c85f..2439932099ae 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -70,7 +70,7 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
 {
 }
 
-void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if( SfxItemState::DEFAULT != eState )
     {
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index e750c11e28eb..0b6176172bf9 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -114,7 +114,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
 }
 
 void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
-                                            const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                            const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if( SfxItemState::DEFAULT != eState )
     {
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 570d2972bcee..05a24fdb56ee 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -164,7 +164,7 @@ SvxZoomSliderControl::~SvxZoomSliderControl()
 {
 }
 
-void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if ( (SfxItemState::DEFAULT != eState) || pState->IsVoidItem() )
     {
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 02bec91814f4..e72b2be86d40 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -88,7 +88,7 @@ SvxFillToolBoxControl::~SvxFillToolBoxControl()
 void SvxFillToolBoxControl::StateChanged(
     sal_uInt16 nSID,
     SfxItemState eState,
-    const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+    const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     const bool bDisabled(SfxItemState::DISABLED == eState);
 
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index bc842afc4835..294d17ca914c 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -92,7 +92,7 @@ void FormatPaintBrushToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
 
 
 void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem )
+                const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem )
 {
     if( eState != SfxItemState::DEFAULT && eState != SfxItemState::SET )
         m_bPersistentCopy = false;
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 6153e55c358a..188e24965275 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -433,7 +433,7 @@ SvxGrafToolBoxControl::~SvxGrafToolBoxControl()
 {
 }
 
-void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 
 {
     ImplGrafControl* pCtrl = static_cast<ImplGrafControl*>( GetToolBox().GetItemWindow( GetId() ) );
@@ -520,7 +520,7 @@ SvxGrafModeToolBoxControl::~SvxGrafModeToolBoxControl()
 {
 }
 
-void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 
 {
     ImplGrafModeControl* pCtrl = static_cast<ImplGrafModeControl*>( GetToolBox().GetItemWindow( GetId() ) );
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index e18574599124..a247ce6660b0 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -698,7 +698,7 @@ VclPtr<SfxPopupWindow> SvxTableToolBoxControl::CreatePopupWindow()
     return nullptr;
 }
 
-void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if ( auto pUInt16Item = dynamic_cast<const SfxUInt16Item* >(pState) )
     {
@@ -745,7 +745,7 @@ VclPtr<SfxPopupWindow> SvxColumnsToolBoxControl::CreatePopupWindow()
 
 void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem )
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem )
 {
     bEnabled = SfxItemState::DISABLED != eState;
     SfxToolBoxControl::StateChanged(nSID,   eState, pState, rSlotItem );
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 099d0fa62f9c..636ef55d6c72 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -188,7 +188,7 @@ SvxUndoRedoControl::~SvxUndoRedoControl()
 }
 
 void SvxUndoRedoControl::StateChanged(
-    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /* rSlotItem */ )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /* rSlotItem */ )
 {
     if ( nSID == SID_UNDO || nSID == SID_REDO )
     {
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 5c38fef233f0..c06889afc16e 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -75,7 +75,7 @@ SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl()
 
 void SvxLineStyleToolBoxControl::StateChanged (
 
-    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /* rSlotItem */ )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /* rSlotItem */ )
 
 {
     SvxLineBox* pBox = static_cast<SvxLineBox*>( GetToolBox().GetItemWindow( GetId() ) );
@@ -199,7 +199,7 @@ SvxLineWidthToolBoxControl::~SvxLineWidthToolBoxControl()
 
 
 void SvxLineWidthToolBoxControl::StateChanged(
-    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /* rSlotItem */ )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /* rSlotItem */ )
 {
     SvxMetricField* pFld = static_cast<SvxMetricField*>(
                            GetToolBox().GetItemWindow( GetId() ));
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5eb1487b0e19..31b3328b7ac7 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -651,7 +651,7 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
                                      SvxStyleToolBoxControl& rTbxCtl );
 
     protected:
-        virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+        virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
     private:
         SvxStyleToolBoxControl& rControl;
@@ -2739,7 +2739,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
 }
 
 void SfxStyleControllerItem_Impl::StateChanged(
-    sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+    sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     switch ( GetId() )
     {
@@ -3176,7 +3176,7 @@ IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification, SvxStyleBox_Impl
 }
 
 void SvxStyleToolBoxControl::StateChanged(
-    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     sal_uInt16       nId    = GetId();
     ToolBox&     rTbx   = GetToolBox();
@@ -3631,7 +3631,7 @@ SvxSimpleUndoRedoController::~SvxSimpleUndoRedoController()
 {
 }
 
-void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     const SfxStringItem* pItem = dynamic_cast<const SfxStringItem*>( pState  );
     ToolBox& rBox = GetToolBox();
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 3c01fa32664d..4ba439c3eaf5 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -61,7 +61,7 @@ void SAL_CALL SvxTbxCtlDraw::initialize( const css::uno::Sequence< css::uno::Any
 
 
 void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem )
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem )
 {
     GetToolBox().EnableItem( GetId(), ( eState != SfxItemState::DISABLED ) );
     SfxToolBoxControl::StateChanged( nSID, eState, pState, rSlotItem );
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 7a83aac9df81..9d96f8e11cc1 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -59,7 +59,7 @@ void SvxVertCTLTextTbxCtrl::initialize(const css::uno::Sequence<css::uno::Any>&
 void SvxVertCTLTextTbxCtrl::StateChanged(
     sal_uInt16 nSID,
     SfxItemState eState,
-    const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem )
+    const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem )
 {
     SvtLanguageOptions aLangOptions;
     bool bCalc = false;
diff --git a/sw/source/uibase/inc/bookctrl.hxx b/sw/source/uibase/inc/bookctrl.hxx
index 9a9a54e42e7d..8008c533baa0 100644
--- a/sw/source/uibase/inc/bookctrl.hxx
+++ b/sw/source/uibase/inc/bookctrl.hxx
@@ -28,7 +28,7 @@ class SwBookmarkControl : public SfxStatusBarControl
 
 public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void    Paint( const UserDrawEvent& rEvt ) override;
 
     SFX_DECL_STATUSBAR_CONTROL();
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index f6a005964551..161a30fdb29b 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -141,7 +141,7 @@ public:
     void            MoveOutline(SwOutlineNodes::size_type nSource, SwOutlineNodes::size_type nTarget, bool bWithCilds);
 
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                            const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                            const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
     virtual void    StateChanged(StateChangedType nStateChange) override;
 
diff --git a/sw/source/uibase/inc/tmplctrl.hxx b/sw/source/uibase/inc/tmplctrl.hxx
index 40907e8ee099..dae4eae5e2ef 100644
--- a/sw/source/uibase/inc/tmplctrl.hxx
+++ b/sw/source/uibase/inc/tmplctrl.hxx
@@ -27,7 +27,7 @@ protected:
     virtual void    Command( const CommandEvent& rCEvt ) override;
 public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void    Paint( const UserDrawEvent& rEvt ) override;
 
     SFX_DECL_STATUSBAR_CONTROL();
diff --git a/sw/source/uibase/inc/viewlayoutctrl.hxx b/sw/source/uibase/inc/viewlayoutctrl.hxx
index 38e42c48ae10..8c7fc7cc1e28 100644
--- a/sw/source/uibase/inc/viewlayoutctrl.hxx
+++ b/sw/source/uibase/inc/viewlayoutctrl.hxx
@@ -36,7 +36,7 @@ public:
     SwViewLayoutControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
     virtual ~SwViewLayoutControl() override;
 
-    virtual void  StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+    virtual void  StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void  Paint( const UserDrawEvent& rEvt ) override;
     virtual bool  MouseButtonDown( const MouseEvent & ) override;
     virtual bool  MouseMove( const MouseEvent & ) override;
diff --git a/sw/source/uibase/inc/wordcountctrl.hxx b/sw/source/uibase/inc/wordcountctrl.hxx
index 81c48bcb3828..dd1edb92fc6b 100644
--- a/sw/source/uibase/inc/wordcountctrl.hxx
+++ b/sw/source/uibase/inc/wordcountctrl.hxx
@@ -28,7 +28,7 @@ public:
     virtual ~SwWordCountStatusBarControl() override;
 
     virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                               const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                               const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
 };
 
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index ebd77cb33017..c63c0f0b4a52 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -62,7 +62,7 @@ public:
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
     DECL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool);
 };
@@ -118,7 +118,7 @@ public:
 
     virtual void            StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
 
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
 };
diff --git a/sw/source/uibase/inc/zoomctrl.hxx b/sw/source/uibase/inc/zoomctrl.hxx
index 90d9f1cd8d91..db5d45e6a5d5 100644
--- a/sw/source/uibase/inc/zoomctrl.hxx
+++ b/sw/source/uibase/inc/zoomctrl.hxx
@@ -28,7 +28,7 @@ private:
 public:
     virtual void    Command( const CommandEvent& rCEvt ) override;
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem ) override;
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem ) override;
     virtual void    Paint( const UserDrawEvent& rEvt ) override;
 
     SFX_DECL_STATUSBAR_CONTROL();
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 20eafd5dc217..f21647fd0560 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -133,7 +133,7 @@ VclPtr<SfxPopupWindow> SwTbxAutoTextCtrl::CreatePopupWindow()
 
 void SwTbxAutoTextCtrl::StateChanged( sal_uInt16,
                                               SfxItemState,
-                                              const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                              const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) );
 }
@@ -581,7 +581,7 @@ SwPreviewZoomControl::~SwPreviewZoomControl()
 
 void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/,
                                          SfxItemState eState,
-                                         const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                         const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     sal_uInt16 nId = GetId();
     GetToolBox().EnableItem( nId, (GetItemState(pState) != SfxItemState::DISABLED) );
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index 4df73378bcee..eee1a87b4b24 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -75,7 +75,7 @@ SwBookmarkControl::~SwBookmarkControl()
 }
 
 void SwBookmarkControl::StateChanged(
-    sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+    sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if( eState != SfxItemState::DEFAULT || pState->IsVoidItem() )
         GetStatusBar().SetItemText( GetId(), OUString() );
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 66d3c395e09d..0b8f5862eb7e 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -837,7 +837,7 @@ IMPL_LINK( SwNavigationPI, ClosePopupWindow, SfxPopupWindow *, pWindow, void )
 }
 
 void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
-                                            const SfxPoolItem* /*pState*/, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+                                            const SfxPoolItem* /*pState*/, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if(nSID == SID_DOCFULLNAME)
     {
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx
index 73e31ae3c10a..e00875d814de 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -74,7 +74,7 @@ SwTemplateControl::~SwTemplateControl()
 }
 
 void SwTemplateControl::StateChanged(
-    sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+    sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     const SfxStringItem* pItem = nullptr;
     if (SfxItemState::DEFAULT == eState && (pItem = dynamic_cast<const SfxStringItem*>(pState)))
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index a3332875481d..b6bdb9b51afb 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -60,7 +60,7 @@ SwViewLayoutControl::~SwViewLayoutControl()
 {
 }
 
-void SwViewLayoutControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/)
+void SwViewLayoutControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/)
 {
     if ( SfxItemState::DEFAULT != eState || pState->IsVoidItem() )
         GetStatusBar().SetItemText( GetId(), OUString() );
diff --git a/sw/source/uibase/utlui/wordcountctrl.cxx b/sw/source/uibase/utlui/wordcountctrl.cxx
index 3f6dc22a124f..a4f852f0ae59 100644
--- a/sw/source/uibase/utlui/wordcountctrl.cxx
+++ b/sw/source/uibase/utlui/wordcountctrl.cxx
@@ -27,7 +27,7 @@ SwWordCountStatusBarControl::~SwWordCountStatusBarControl()
 }
 
 void SwWordCountStatusBarControl::StateChanged(
-    sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::IBase::SharedPtr& /*rSlotItem*/ )
+    sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& /*rSlotItem*/ )
 {
     if (eState == SfxItemState::DEFAULT) // Can access pState
         GetStatusBar().SetItemText( GetId(), static_cast<const SfxStringItem*>(pState)->GetValue() );
diff --git a/sw/source/uibase/utlui/zoomctrl.cxx b/sw/source/uibase/utlui/zoomctrl.cxx
index 59a620458104..6941af58fbf1 100644
--- a/sw/source/uibase/utlui/zoomctrl.cxx
+++ b/sw/source/uibase/utlui/zoomctrl.cxx
@@ -41,7 +41,7 @@ SwZoomControl::~SwZoomControl()
 }
 
 void SwZoomControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState, const Item::IBase::SharedPtr& rSlotItem )
+                                  const SfxPoolItem* pState, const Item::ItemBase::SharedPtr& rSlotItem )
 {
     const SfxStringItem* pItem = nullptr;
     if (SfxItemState::DEFAULT == eState && (pItem = dynamic_cast<const SfxStringItem*>(pState)))