cleanups && linux build adaptions

Change-Id: I5081ce778b72da263382969ea4452af3e2164acc

12 files changed, 59 insertions, 157 deletions

diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 8631f4efd2d7..342025b969ea 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -573,6 +573,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
         case SID_BASICIDE_SBXINSERTED:
         {
             DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
+            // I2TM
             const auto aSbxItem = rReq.GetArgs()->slotSet().GetSlot<const Item::Sbx>(SID_BASICIDE_ARG_SBX);
             const ScriptDocument& aDocument( aSbxItem->GetDocument() );
             const OUString& aLibName( aSbxItem->GetLibName() );
@@ -588,28 +589,15 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
                     FindDlgWin(aDocument, aLibName, aName, true);
                 }
             }
-            // const SbxItem& rSbxItem = rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX );
-            // const ScriptDocument& aDocument( rSbxItem.GetDocument() );
-            // const OUString& aLibName( rSbxItem.GetLibName() );
-            // const OUString& aName( rSbxItem.GetName() );
-            // if ( m_aCurLibName.isEmpty() || ( aDocument == m_aCurDocument && aLibName == m_aCurLibName ) )
-            // {
-            //     if ( rSbxItem.GetType() == TYPE_MODULE )
-            //         FindBasWin( aDocument, aLibName, aName, true );
-            //     else if ( rSbxItem.GetType() == TYPE_DIALOG )
-            //         FindDlgWin( aDocument, aLibName, aName, true );
-            // }
         }
         break;
         case SID_BASICIDE_SBXDELETED:
         {
             DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
+            // I2TM
             const auto aSbxItem = rReq.GetArgs()->slotSet().GetSlot<const Item::Sbx>(SID_BASICIDE_ARG_SBX);
             const ScriptDocument& aDocument(aSbxItem->GetDocument());
             VclPtr<BaseWindow> pWin = FindWindow(aDocument, aSbxItem->GetLibName(), aSbxItem->GetName(), aSbxItem->GetType(), true);
-            // const SbxItem& rSbxItem = rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX );
-            // const ScriptDocument& aDocument( rSbxItem.GetDocument() );
-            // VclPtr<BaseWindow> pWin = FindWindow( aDocument, rSbxItem.GetLibName(), rSbxItem.GetName(), rSbxItem.GetType(), true );
             if ( pWin )
                 RemoveWindow( pWin, true );
         }
@@ -617,27 +605,23 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
         case SID_BASICIDE_SHOWSBX:
         {
             DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
+            // I2TM
             const auto aSbxItem = rReq.GetArgs()->slotSet().GetSlot<const Item::Sbx>(SID_BASICIDE_ARG_SBX);
             const ScriptDocument& aDocument(aSbxItem->GetDocument());
             const OUString& aLibName(aSbxItem->GetLibName());
             const OUString& aName(aSbxItem->GetName());
-            // const SbxItem& rSbxItem = rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX );
-            // const ScriptDocument& aDocument( rSbxItem.GetDocument() );
-            // const OUString& aLibName( rSbxItem.GetLibName() );
-            // const OUString& aName( rSbxItem.GetName() );
+
             SetCurLib( aDocument, aLibName );
             BaseWindow* pWin = nullptr;
-            // if ( rSbxItem.GetType() == TYPE_DIALOG )
+
             if(TYPE_DIALOG == aSbxItem->GetType())
             {
                 pWin = FindDlgWin( aDocument, aLibName, aName, true );
             }
-            // else if ( rSbxItem.GetType() == TYPE_MODULE )
             else if(TYPE_MODULE == aSbxItem->GetType())
             {
                 pWin = FindBasWin( aDocument, aLibName, aName, true );
             }
-            // else if ( rSbxItem.GetType() == TYPE_METHOD )
             else if(TYPE_METHOD == aSbxItem->GetType())
             {
                 pWin = FindBasWin( aDocument, aLibName, aName, true );
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index d187fae140e6..9f58eb75d568 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -853,6 +853,7 @@ bool TreeListBox::OpenCurrent()
         case OBJ_TYPE_DIALOG:
             if (SfxDispatcher* pDispatcher = GetDispatcher())
             {
+                // I2TM
                 ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
                 aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                     aDesc.GetDocument(),
@@ -865,15 +866,6 @@ bool TreeListBox::OpenCurrent()
                     SfxCallMode::SYNCHRON,
                     aSlotSet
                 );
-                // SbxItem aSbxItem(
-                //     SID_BASICIDE_ARG_SBX, aDesc.GetDocument(),
-                //     aDesc.GetLibName(), aDesc.GetName(), aDesc.GetMethodName(),
-                //     ConvertType(aDesc.GetType())
-                // );
-                // pDispatcher->ExecuteList(
-                //     SID_BASICIDE_SHOWSBX, SfxCallMode::SYNCHRON,
-                //     { &aSbxItem }
-                // );
                 return true;
             }
             break;
@@ -1550,6 +1542,7 @@ IMPL_LINK_NOARG(SbTreeListBox, OpenCurrentHdl, weld::TreeView&, void)
         case OBJ_TYPE_DIALOG:
             if (SfxDispatcher* pDispatcher = GetDispatcher())
             {
+                // I2TM
                 ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
                 aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                     aDesc.GetDocument(),
@@ -1562,15 +1555,6 @@ IMPL_LINK_NOARG(SbTreeListBox, OpenCurrentHdl, weld::TreeView&, void)
                     SfxCallMode::SYNCHRON,
                     aSlotSet
                 );
-                // SbxItem aSbxItem(
-                //     SID_BASICIDE_ARG_SBX, aDesc.GetDocument(),
-                //     aDesc.GetLibName(), aDesc.GetName(), aDesc.GetMethodName(),
-                //     ConvertType(aDesc.GetType())
-                // );
-                // pDispatcher->ExecuteList(
-                //     SID_BASICIDE_SHOWSBX, SfxCallMode::SYNCHRON,
-                //     { &aSbxItem }
-                // );
                 return;
             }
             break;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b1cc3b51c52d..95803dab8437 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1492,6 +1492,7 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
 
                 if(SfxDispatcher* pDispatcher = GetDispatcher())
                 {
+                    // I2TM
                     ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
                     aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                         rDocument,
@@ -1505,10 +1506,6 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
                         aSlotSet
                     );
                 }
-                // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, TYPE_MODULE );
-                // if (SfxDispatcher* pDispatcher = GetDispatcher())
-                //     pDispatcher->ExecuteList(SID_BASICIDE_SBXINSERTED,
-                //                           SfxCallMode::SYNCHRON, { &aSbxItem });
 
                 if( pBasicBox )
                 {
@@ -1619,6 +1616,7 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
 
                 if(SfxDispatcher* pDispatcher = GetDispatcher())
                 {
+                    // I2TM
                     ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
                     aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                         rDocument,
@@ -1632,10 +1630,6 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
                         aSlotSet
                     );
                 }
-                // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, TYPE_MODULE );
-                // if (SfxDispatcher* pDispatcher = GetDispatcher())
-                //     pDispatcher->ExecuteList(SID_BASICIDE_SBXINSERTED,
-                //                           SfxCallMode::SYNCHRON, { &aSbxItem });
 
                 if( pBasicBox )
                 {
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 98c3681163ec..402f95c2d244 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -120,6 +120,7 @@ bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewT
 
     if (SfxDispatcher* pDispatcher = GetDispatcher())
     {
+        // I2TM
         ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
         aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
             aDocument,
@@ -132,9 +133,6 @@ bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewT
             SfxCallMode::SYNCHRON,
             aSlotSet
         );
-        // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, rNewText, ConvertType( eType ) );
-        // pDispatcher->ExecuteList( SID_BASICIDE_SBXRENAMED,
-        //                     SfxCallMode::SYNCHRON, { &aSbxItem });
     }
 
     // OV-Bug?!
@@ -366,6 +364,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi
         {
             if( pDispatcher )
             {
+                // I2TM
                 ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
                 aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                     rSourceDoc,
@@ -378,9 +377,6 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi
                     SfxCallMode::SYNCHRON,
                     aSlotSet
                 );
-                // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rSourceDoc, aSourceLibName, aSourceName, ConvertType( eType ) );
-                // pDispatcher->ExecuteList( SID_BASICIDE_SBXDELETED,
-                //       SfxCallMode::SYNCHRON, { &aSbxItem });
             }
         }
 
@@ -470,6 +466,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi
     {
         if( pDispatcher )
         {
+            // I2TM
             ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
             aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                 rDestDoc,
@@ -482,9 +479,6 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi
                 SfxCallMode::SYNCHRON,
                 aSlotSet
             );
-            // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDestDoc, aDestLibName, aSourceName, ConvertType( eType ) );
-            // pDispatcher->ExecuteList( SID_BASICIDE_SBXINSERTED,
-            //                       SfxCallMode::SYNCHRON, { &aSbxItem });
         }
     }
 
@@ -749,6 +743,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton, void )
                     aModName = aModName.getToken( 0, ' ' );
                 }
 
+                // I2TM
                 ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
                 aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                     aDesc.GetDocument(),
@@ -761,10 +756,6 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton, void )
                     SfxCallMode::SYNCHRON,
                     aSlotSet
                 );
-                // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(),
-                //                   aModName, TreeListBox::ConvertType( aDesc.GetType() ) );
-                // pDispatcher->ExecuteList(SID_BASICIDE_SHOWSBX,
-                //         SfxCallMode::SYNCHRON, { &aSbxItem });
             }
         }
         else    // only Lib selected
@@ -888,9 +879,9 @@ void ObjectPage::NewDialog()
                 if ( !aDocument.createDialog( aLibName, aDlgName, xISP ) )
                     return;
 
-                // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, TYPE_DIALOG );
                 if (SfxDispatcher* pDispatcher = GetDispatcher())
                 {
+                    // I2TM
                     ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
                     aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                         aDocument,
@@ -903,8 +894,6 @@ void ObjectPage::NewDialog()
                         SfxCallMode::SYNCHRON,
                         aSlotSet
                     );
-                    // pDispatcher->ExecuteList( SID_BASICIDE_SBXINSERTED,
-                    //     SfxCallMode::SYNCHRON, { &aSbxItem });
                 }
                 LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
                 SvTreeListEntry* pRootEntry = m_pBasicBox->FindRootEntry( aDocument, eLocation );
@@ -958,6 +947,7 @@ void ObjectPage::DeleteCurrent()
             m_pBasicBox->Select( m_pBasicBox->GetCurEntry() );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
         {
+            // I2TM
             ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
             aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                 aDocument,
@@ -970,9 +960,6 @@ void ObjectPage::DeleteCurrent()
                 SfxCallMode::SYNCHRON,
                 aSlotSet
             );
-            // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aName, TreeListBox::ConvertType( eType ) );
-            // pDispatcher->ExecuteList( SID_BASICIDE_SBXDELETED,
-            //                       SfxCallMode::SYNCHRON, { &aSbxItem });
         }
 
         try
@@ -1056,9 +1043,9 @@ SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
             StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : nullptr;
             if ( pBasic )
                 pModule = pBasic->FindModule( aModName );
-            // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, TYPE_MODULE );
             if (SfxDispatcher* pDispatcher = GetDispatcher())
             {
+                // I2TM
                 ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
                 aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                     rDocument,
@@ -1071,8 +1058,6 @@ SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
                     SfxCallMode::SYNCHRON,
                     aSlotSet
                 );
-                // pDispatcher->ExecuteList( SID_BASICIDE_SBXINSERTED,
-                //       SfxCallMode::SYNCHRON, { &aSbxItem });
             }
             LibraryLocation eLocation = rDocument.getLibraryLocation( aLibName );
             SvTreeListEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument, eLocation );
@@ -1164,9 +1149,9 @@ SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
             StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : nullptr;
             if ( pBasic )
                 pModule = pBasic->FindModule( aModName );
-            // SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, TYPE_MODULE );
             if (SfxDispatcher* pDispatcher = GetDispatcher())
             {
+                // I2TM
                 ::Item::SlotSet::SharedPtr aSlotSet(::Item::SlotSet::Create());
                 aSlotSet->SetSlot(SID_BASICIDE_ARG_SBX, Item::Sbx::Create(
                     rDocument,
@@ -1179,8 +1164,6 @@ SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
                     SfxCallMode::SYNCHRON,
                     aSlotSet
                 );
-                // pDispatcher->ExecuteList( SID_BASICIDE_SBXINSERTED,
-                //       SfxCallMode::SYNCHRON, { &aSbxItem });
             }
             LibraryLocation eLocation = rDocument.getLibraryLocation( aLibName );
             std::unique_ptr<weld::TreeIter> xIter(rBasicBox.make_iterator());
diff --git a/basctl/source/basicide/sbxitem.cxx b/basctl/source/basicide/sbxitem.cxx
index a8e5dc6f9acc..aba31041228e 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -22,7 +22,6 @@
 
 namespace basctl
 {
-
 // I2TM
 namespace Item
 {
@@ -61,57 +60,6 @@ namespace Item
     }
 }
 // ~I2TM
-
-// SfxPoolItem* SbxItem::CreateDefault() { SAL_WARN( "basctl.basicide", "No SbxItem factory available"); return nullptr; }
-// SbxItem::SbxItem (
-//     sal_uInt16 nWhichItem,
-//     ScriptDocument const& rDocument,
-//     OUString const& aLibName,
-//     OUString const& aName,
-//     ItemType eType
-// ) :
-//     SfxPoolItem(nWhichItem),
-//     m_aDocument(rDocument),
-//     m_aLibName(aLibName),
-//     m_aName(aName),
-//     m_eType(eType)
-// { }
-
-// SbxItem::SbxItem (
-//     sal_uInt16 nWhichItem,
-//     ScriptDocument const& rDocument,
-//     OUString const& aLibName,
-//     OUString const& aName,
-//     OUString const& aMethodName,
-//     ItemType eType
-// ) :
-//     SfxPoolItem(nWhichItem),
-//     m_aDocument(rDocument),
-//     m_aLibName(aLibName),
-//     m_aName(aName),
-//     m_aMethodName(aMethodName),
-//     m_eType(eType)
-// { }
-
-// SfxPoolItem *SbxItem::Clone(SfxItemPool*) const
-// {
-//     return new SbxItem(*this);
-// }
-
-// bool SbxItem::operator==(const SfxPoolItem& rCmp) const
-// {
-//     SbxItem const* pSbxItem = dynamic_cast<SbxItem const*>(&rCmp);
-//     assert(pSbxItem); //no SbxItem!
-//     return
-//         SfxPoolItem::operator==(rCmp) &&
-//         pSbxItem &&
-//         m_aDocument == pSbxItem->m_aDocument &&
-//         m_aLibName == pSbxItem->m_aLibName &&
-//         m_aName == pSbxItem->m_aName &&
-//         m_aMethodName == pSbxItem->m_aMethodName &&
-//         m_eType == pSbxItem->m_eType;
-// }
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index c8420de9d17e..1c89b30e2865 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -83,35 +83,8 @@ namespace Item
     };
 }
 // ~I2TM
-
-// class SbxItem : public SfxPoolItem
-// {
-//     const ScriptDocument    m_aDocument;
-//     const OUString          m_aLibName;
-//     const OUString          m_aName;
-//     const OUString          m_aMethodName;
-//     ItemType                m_eType;
-
-// public:
-//     static SfxPoolItem* CreateDefault();
-//     SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, ItemType);
-//     SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType);
-
-//     virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override;
-//     virtual bool operator==(const SfxPoolItem&) const override;
-
-//     ScriptDocument const& GetDocument () const { return m_aDocument; }
-//     OUString const& GetLibName () const { return m_aLibName; }
-//     OUString const& GetName () const { return m_aName; }
-//     OUString const& GetMethodName () const { return m_aMethodName; }
-//     ItemType GetType () const { return m_eType; }
-// };
-
 } // namespace basctl
 
-// For baside.sdi, because I don't know how to use nested names in it.
-// using basctl::SbxItem;
-
 #endif // INCLUDED_BASCTL_SOURCE_INC_SBXITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 5f93c6e1507d..7f791d23799d 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -596,8 +596,10 @@ class SvxSearchItem;
 #define SID_BASICIDE_LIBLOADED              ( SID_BASICIDE_START + 27 )
 #define SID_BASICIDE_LIBREMOVED             ( SID_BASICIDE_START + 28 )
 #define SID_BASICIDE_ARG_TABID              TypedWhichId<SfxUInt16Item>( SID_BASICIDE_START + 30 )
+
+// I2TM
 #define SID_BASICIDE_ARG_SBX                ( SID_BASICIDE_START + 31 )
-// #define SID_BASICIDE_ARG_SBX                TypedWhichId<SbxItem>( SID_BASICIDE_START + 31 )
+
 #define SID_BASICIDE_ARG_MACROINFO          TypedWhichId<SfxMacroInfoItem>( SID_BASICIDE_START + 32 )
 #define SID_BASICIDE_ARG_LIBNAME            TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 34 )
 #define SID_BASICIDE_ARG_MODULENAME         TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 35 )
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index 13ba60d1a319..2f92e60ba535 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 
 #include <cppuhelper/implbase.hxx>
+#include <item/base/ItemBase.hxx>
 
 namespace com::sun::star::frame { class XDispatch; }
 namespace com::sun::star::frame { class XDispatchProvider; }
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 767a82031d93..c3939f28fdd0 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -24,6 +24,7 @@
 #include <svl/poolitem.hxx>
 #include <svtools/statusbarcontroller.hxx>
 #include <vcl/status.hxx>
+#include <item/base/ItemBase.hxx>
 
 
 class SfxModule;
diff --git a/item/source/base/ItemBase.cxx b/item/source/base/ItemBase.cxx
index 4da304dbed3e..533d462f0dc4 100644
--- a/item/source/base/ItemBase.cxx
+++ b/item/source/base/ItemBase.cxx
@@ -19,6 +19,37 @@
 class SbxItem : public SfxPoolItem
 -> basctl::Item::Sbx
 -> SID_BASICIDE_ARG_SBX
+-> Done!
+
+defs from sfx2\sdi\sfxitems.sdi may be a good hint which items to convert first (?)
+these are:
+    item void       SfxVoidItem;
+    item BOOL       SfxBoolItem;
+    item INT32      SfxUInt16Item;
+    item INT16      SfxInt16Item;
+    item INT32      SfxUInt32Item;
+    item INT32      SfxInt32Item;
+    item String     SfxStringItem;
+    item BYTE       SfxByteItem;
+    item INT16      SfxEnumItem;
+
+    item String     SfxObjectItem;          //! Dummy
+    item String     SfxTemplateItem;        //! Dummy
+    item String     SfxMacroInfoItem;       //! Dummy
+    item String     SfxImageItem;           //! Dummy
+    item String     SfxObjectShellItem      //! Dummy
+    item String     SfxUnoAnyItem           //! Dummy
+    item String     SfxUnoFrameItem         //! Dummy
+    item String     SfxWatermarkItem        //! Dummy
+
+    item Point SfxPointItem;
+    item Rectangle SfxRectangleItem;
+    item DocInfo SfxDocumentInfoItem;
+    item SvxSearch SvxSearchItem;
+    item SvxSize SvxSizeItem;
+    item SfxScriptOrganizer SfxScriptOrganizerItem;
+    item String     SvxClipboardFormatItem;    //! Dummy
+    item SvxZoom SvxZoomItem;
 
 class SvxChartColorTableItem : public SfxPoolItem
 -> only uses SID_SCH_EDITOPTIONS, currently has non-static members, but no need for them
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 456237c69b01..ced896e5148e 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3722,7 +3722,7 @@ SfxBoolItem Saved SID_DOC_SAVED
 
 
 SfxVoidItem SbxDeleted SID_BASICIDE_SBXDELETED
-// (SbxItem Sbx SID_BASICIDE_ARG_SBX)
+// I2TM
 (basctl::Item::Sbx Sbx SID_BASICIDE_ARG_SBX)
 [
     AutoUpdate = FALSE,
@@ -3741,7 +3741,7 @@ SfxVoidItem SbxDeleted SID_BASICIDE_SBXDELETED
 
 
 SfxVoidItem SbxInserted SID_BASICIDE_SBXINSERTED
-// (SbxItem Sbx SID_BASICIDE_ARG_SBX)
+// I2TM
 (basctl::Item::Sbx Sbx SID_BASICIDE_ARG_SBX)
 [
     AutoUpdate = FALSE,
@@ -4036,7 +4036,7 @@ SfxBoolItem ShowPopups SID_SHOWPOPUPS
 
 
 SfxVoidItem ShowSbx SID_BASICIDE_SHOWSBX
-// (SbxItem Sbx SID_BASICIDE_ARG_SBX)
+// I2TM
 (basctl::Item::Sbx Sbx SID_BASICIDE_ARG_SBX)
 [
     AutoUpdate = FALSE,
diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi
index 90fb6e0b26b8..df77194e786d 100644
--- a/sfx2/sdi/sfxitems.sdi
+++ b/sfx2/sdi/sfxitems.sdi
@@ -26,8 +26,9 @@
     item BYTE       SfxByteItem;
     item INT16      SfxEnumItem;
 
-//    item String     SbxItem;                //! Dummy
-    item String      basctl::Item::Sbx;      //! Dummy
+    // I2TM
+    item String     basctl::Item::Sbx;      //! Dummy
+
     item String     SfxObjectItem;          //! Dummy
     item String     SfxTemplateItem;        //! Dummy
     item String     SfxMacroInfoItem;       //! Dummy