[Libreoffice-commits] core.git: 6 commits - desktop/source idl/inc idl/source sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi sw/source

Maxim Monastirsky momonasmon at gmail.com
Sun Apr 30 22:35:20 UTC 2017


 desktop/source/app/app.cxx         |    2 
 idl/inc/globals.hxx                |    2 
 idl/inc/slot.hxx                   |    5 
 idl/source/objects/slot.cxx        |  148 +++---------------
 idl/source/prj/globals.cxx         |    1 
 idl/source/prj/parser.cxx          |   79 ++--------
 sc/sdi/scalc.sdi                   |   43 ++---
 sd/sdi/_drvwsh.sdi                 |    4 
 sd/sdi/sdraw.sdi                   |   24 +--
 sfx2/sdi/sfx.sdi                   |  199 ++++++++-----------------
 starmath/sdi/smath.sdi             |    6 
 svx/sdi/svx.sdi                    |  290 ++++++++-----------------------------
 sw/sdi/_basesh.sdi                 |   12 -
 sw/sdi/drawsh.sdi                  |    1 
 sw/sdi/swriter.sdi                 |  261 +++++++++++----------------------
 sw/source/uibase/shells/basesh.cxx |   38 ----
 16 files changed, 313 insertions(+), 802 deletions(-)

New commits:
commit 862b6c0a32dfce924bfafa84acaed47c5380fc46
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon May 1 00:42:11 2017 +0300

    loplugin:stringconstant
    
    Change-Id: I8f7a0d5b4b0534c71a32457d58006af0d6ddf133

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1b0d26d219a4..e3eabd7a2d68 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1469,7 +1469,7 @@ int Desktop::Main()
         SetSplashScreenProgress(30);
 
         // create title string
-        OUString aTitle(ReplaceStringHookProc(OUString(RID_APPTITLE)));
+        OUString aTitle(ReplaceStringHookProc(RID_APPTITLE));
 
 #ifdef DBG_UTIL
         //include buildid in non product builds
commit c2f7c567b7264c25180e2717eabad61c4c92ae0e
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Apr 30 14:02:18 2017 +0300

    svidl: Adapt to SlotType removal
    
    No diff in workdir/SdiTarget.
    
    BEWARE: If you're going to revert this for whatever
    reason, you should also revert the previous commit
    that removed the SlotType property from sdi files!
    
    Change-Id: I78cc391a6b47f4672157926eba1b55e786f48f2d

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 964176cfcce6..d54153badc30 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -60,7 +60,6 @@ struct SvGlobalHashNames
     SvStringHashEntry* MM_Container;
     SvStringHashEntry* MM_ReadOnlyDoc;
     SvStringHashEntry* MM_struct;
-    SvStringHashEntry* MM_SlotType;
     SvStringHashEntry* MM_DisableFlags;
 
     SvGlobalHashNames();
@@ -122,7 +121,6 @@ HASH_INLINE(SbxObject)
 HASH_INLINE(Container)
 HASH_INLINE(ReadOnlyDoc)
 HASH_INLINE(struct)
-HASH_INLINE(SlotType)
 HASH_INLINE(DisableFlags)
 
 
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 4816332ef6cf..b7762d0089df 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -26,7 +26,6 @@
 class SvMetaSlot : public SvMetaAttribute
 {
 public:
-    tools::SvRef<SvMetaType>      aSlotType;
     SvIdentifier     aGroupId;
     SvIdentifier     aExecMethod;
     SvIdentifier     aStateMethod;
@@ -84,7 +83,6 @@ public:
             SvMetaSlot();
             SvMetaSlot( SvMetaType * pType );
 
-    SvMetaType *        GetSlotType() const;
     const OString&      GetGroupId() const;
     const OString&      GetExecMethod() const;
     const OString&      GetStateMethod() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 018b57cf202c..b14b0ec1b031 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -88,11 +88,6 @@ bool SvMetaSlot::IsMethod() const
 |*                      IsSet() provides FALSE (default initialization).
 *************************************************************************/
 /** reference disbandment **/
-SvMetaType * SvMetaSlot::GetSlotType() const
-{
-    if( aSlotType.is() || !GetRef() ) return aSlotType.get();
-    return static_cast<SvMetaSlot *>(GetRef())->GetSlotType();
-}
 const OString& SvMetaSlot::GetGroupId() const
 {
     if( !aGroupId.getString().isEmpty() || !GetRef() ) return aGroupId.getString();
@@ -191,75 +186,36 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 {
     SvMetaAttribute::ReadAttributesSvIdl( rBase, rInStm );
 
-    bool bOk = false;
-    bOk |= aGroupId.ReadSvIdl( SvHash_GroupId(), rInStm );
-    bOk |= aExecMethod.ReadSvIdl( SvHash_ExecMethod(), rInStm );
-    bOk |= aStateMethod.ReadSvIdl( SvHash_StateMethod(), rInStm );
-    bOk |= ReadStringSvIdl( SvHash_DisableFlags(), rInStm, aDisableFlags );
-    bOk |= aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm );
-    bOk |= aExport.ReadSvIdl( SvHash_Export(), rInStm );
+    aGroupId.ReadSvIdl( SvHash_GroupId(), rInStm );
+    aExecMethod.ReadSvIdl( SvHash_ExecMethod(), rInStm );
+    aStateMethod.ReadSvIdl( SvHash_StateMethod(), rInStm );
+    ReadStringSvIdl( SvHash_DisableFlags(), rInStm, aDisableFlags );
+    aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm );
+    aExport.ReadSvIdl( SvHash_Export(), rInStm );
+    aToggle.ReadSvIdl( SvHash_Toggle(), rInStm );
+    aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm );
+    aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm );
+    aRecordAbsolute.ReadSvIdl( SvHash_RecordAbsolute(), rInStm );
 
-    if( aToggle.ReadSvIdl( SvHash_Toggle(), rInStm ) )
-    {
-        bOk = true;
-    }
-    if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) )
-    {
-        bOk = true;
-    }
-    if( aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm ) )
-    {
-        bOk = true;
-    }
-    if( aRecordAbsolute.ReadSvIdl( SvHash_RecordAbsolute(), rInStm ) )
-    {
-        bOk = true;
-    }
     if( aRecordPerItem.ReadSvIdl( SvHash_RecordPerItem(), rInStm ) )
     {
         SetRecordPerItem( aRecordPerItem );
-        bOk = true;
     }
     if( aRecordPerSet.ReadSvIdl( SvHash_RecordPerSet(), rInStm ) )
     {
         SetRecordPerSet( aRecordPerSet );
-        bOk = true;
     }
     if( aNoRecord.ReadSvIdl( SvHash_NoRecord(), rInStm ) )
     {
         SetNoRecord( aNoRecord );
-        bOk = true;
     }
 
-    bOk |= aMenuConfig.ReadSvIdl( SvHash_MenuConfig(), rInStm );
-    bOk |= aToolBoxConfig.ReadSvIdl( SvHash_ToolBoxConfig(), rInStm );
-    bOk |= aAccelConfig.ReadSvIdl( SvHash_AccelConfig(), rInStm );
-
-    bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
-    bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
+    aMenuConfig.ReadSvIdl( SvHash_MenuConfig(), rInStm );
+    aToolBoxConfig.ReadSvIdl( SvHash_ToolBoxConfig(), rInStm );
+    aAccelConfig.ReadSvIdl( SvHash_AccelConfig(), rInStm );
 
-    if( !bOk )
-    {
-        if( !aSlotType.is() )
-        {
-            sal_uInt32 nTokPos = rInStm.Tell();
-            SvToken& rTok = rInStm.GetToken_Next();
-            if( rTok.Is( SvHash_SlotType() ) )
-            {
-                if( rInStm.ReadIf( '=' ) )
-                {
-                    aSlotType = rBase.ReadKnownType( rInStm );
-                    if( !aSlotType.is() )
-                        throw SvParseException( rInStm, "SlotType with unknown item type" );
-                    if( !aSlotType->IsItem() )
-                        throw SvParseException( rInStm, "the SlotType is not a item" );
-                    return;
-                }
-            }
-            rInStm.Seek( nTokPos );
-
-        }
-    }
+    aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
+    aContainer.ReadSvIdl( SvHash_Container(), rInStm );
 }
 
 bool SvMetaSlot::Test( SvTokenStream & rInStm )
@@ -586,16 +542,16 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
     rOutStm.WriteChar( ',' ) << endl;
     WriteTab( rOutStm, 4 );
 
-    SvMetaType * pT = GetSlotType();
-    if( !pT )
+    SvMetaType * pT = GetType();
+    if( !IsVariable() )
     {
-        if( !IsVariable() )
-            pT = rBase.FindType( "SfxVoidItem" );
-        else
-            pT = GetType();
+        SvMetaType * pRT = GetType()->GetReturnType();
+        pT =  pRT ? pRT : rBase.FindType( "SfxVoidItem" );
     }
+
     if( pT )
     {
+        assert(pT->IsItem());
         rOutStm.WriteOString( pT->GetName() );
         if( !SvIdlDataBase::FindType( pT, rBase.aUsedTypes ) )
             rBase.aUsedTypes.push_back( pT );
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 57b27b1c85e5..965369b1f130 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -90,7 +90,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(Container)
     A_ENTRY(ReadOnlyDoc)
     A_ENTRY(struct)
-    A_ENTRY(SlotType)
     A_ENTRY(DisableFlags)
 {}
 
diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx
index da8e574c17a6..f0683ab92a92 100644
--- a/idl/source/prj/parser.cxx
+++ b/idl/source/prj/parser.cxx
@@ -381,70 +381,43 @@ bool SvIdlParser::ReadSlot(SvMetaSlot& rSlot)
 
 void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot )
 {
-    bool bOk = false;
-    bOk |= ReadIfIdAttribute(rSlot.aGroupId, SvHash_GroupId() );
-    bOk |= ReadIfIdAttribute(rSlot.aExecMethod, SvHash_ExecMethod() );
-    bOk |= ReadIfIdAttribute(rSlot.aStateMethod, SvHash_StateMethod() );
-    bOk |= ReadStringSvIdl( SvHash_DisableFlags(), rInStm, rSlot.aDisableFlags );
-    bOk |= ReadIfBoolAttribute(rSlot.aReadOnlyDoc, SvHash_ReadOnlyDoc() );
-    bOk |= ReadIfBoolAttribute(rSlot.aExport, SvHash_Export() );
-
-    bOk |= ReadIfBoolAttribute(rSlot.aToggle, SvHash_Toggle() );
-    bOk |= ReadIfBoolAttribute(rSlot.aAutoUpdate, SvHash_AutoUpdate() );
-    bOk |= ReadIfBoolAttribute(rSlot.aAsynchron, SvHash_Asynchron() );
-    bOk |= ReadIfBoolAttribute(rSlot.aRecordAbsolute, SvHash_RecordAbsolute() );
+    ReadIfIdAttribute(rSlot.aGroupId, SvHash_GroupId() );
+    ReadIfIdAttribute(rSlot.aExecMethod, SvHash_ExecMethod() );
+    ReadIfIdAttribute(rSlot.aStateMethod, SvHash_StateMethod() );
+    ReadStringSvIdl( SvHash_DisableFlags(), rInStm, rSlot.aDisableFlags );
+    ReadIfBoolAttribute(rSlot.aReadOnlyDoc, SvHash_ReadOnlyDoc() );
+    ReadIfBoolAttribute(rSlot.aExport, SvHash_Export() );
+
+    ReadIfBoolAttribute(rSlot.aToggle, SvHash_Toggle() );
+    ReadIfBoolAttribute(rSlot.aAutoUpdate, SvHash_AutoUpdate() );
+    ReadIfBoolAttribute(rSlot.aAsynchron, SvHash_Asynchron() );
+    ReadIfBoolAttribute(rSlot.aRecordAbsolute, SvHash_RecordAbsolute() );
 
     if( ReadIfBoolAttribute(rSlot.aRecordPerItem, SvHash_RecordPerItem()) )
     {
         if (rSlot.aRecordPerSet.IsSet() || rSlot.aNoRecord.IsSet())
             throw SvParseException(rInStm, "conflicting attributes");
         rSlot.SetRecordPerItem( rSlot.aRecordPerItem );
-        bOk = true;
     }
     if( ReadIfBoolAttribute(rSlot.aRecordPerSet, SvHash_RecordPerSet() ) )
     {
         if (rSlot.aRecordPerItem.IsSet() || rSlot.aNoRecord.IsSet())
             throw SvParseException(rInStm, "conflicting attributes");
         rSlot.SetRecordPerSet( rSlot.aRecordPerSet );
-        bOk = true;
     }
     if( ReadIfBoolAttribute(rSlot.aNoRecord, SvHash_NoRecord() ) )
     {
         if (rSlot.aRecordPerItem.IsSet() || rSlot.aRecordPerSet.IsSet())
             throw SvParseException(rInStm, "conflicting attributes");
         rSlot.SetNoRecord( rSlot.aNoRecord );
-        bOk = true;
     }
 
-    bOk |= ReadIfBoolAttribute(rSlot.aMenuConfig, SvHash_MenuConfig() );
-    bOk |= ReadIfBoolAttribute(rSlot.aToolBoxConfig, SvHash_ToolBoxConfig() );
-    bOk |= ReadIfBoolAttribute(rSlot.aAccelConfig, SvHash_AccelConfig() );
-
-    bOk |= ReadIfBoolAttribute(rSlot.aFastCall, SvHash_FastCall() );
-    bOk |= ReadIfBoolAttribute(rSlot.aContainer, SvHash_Container() );
-
-    if( bOk )
-        return;
-
-    if( !rSlot.aSlotType.is() )
-    {
-        sal_uInt32 nTokPos = rInStm.Tell();
-        SvToken& rTok = rInStm.GetToken_Next();
-        if( rTok.Is( SvHash_SlotType() ) )
-        {
-            if( rInStm.ReadIf( '=' ) )
-            {
-                rSlot.aSlotType = rBase.ReadKnownType( rInStm );
-                if( !rSlot.aSlotType.is() )
-                    throw SvParseException( rInStm, "SlotType with unknown item type" );
-                if( !rSlot.aSlotType->IsItem() )
-                    throw SvParseException( rInStm, "the SlotType is not a item" );
-                return;
-            }
-        }
-        rInStm.Seek( nTokPos );
+    ReadIfBoolAttribute(rSlot.aMenuConfig, SvHash_MenuConfig() );
+    ReadIfBoolAttribute(rSlot.aToolBoxConfig, SvHash_ToolBoxConfig() );
+    ReadIfBoolAttribute(rSlot.aAccelConfig, SvHash_AccelConfig() );
 
-    }
+    ReadIfBoolAttribute(rSlot.aFastCall, SvHash_FastCall() );
+    ReadIfBoolAttribute(rSlot.aContainer, SvHash_Container() );
 }
 
 void SvIdlParser::ReadInterfaceOrShellMethod( SvMetaAttribute& rAttr )
commit 1c6cb1e8386eb627adb0c70169582cc58fd76ec7
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Apr 30 12:40:20 2017 +0300

    Remove SlotType sdi property
    
    sdi files have two ways to specify the type of a slot:
    
    (a) Put it at the beginning of the first line
    (b) Using the SlotType property
    
    Where (b) have higher priority, and (a) is actually
    ignored for "method slots" (i.e. the ones that have
    parameter parentheses, even empty, and therefore get
    the SfxSlotMode::METHOD flag), which is very
    confusing.
    
    The goal here is to make exclusive use of (a) for all
    kinds of slots, and eventually remove the SlotType
    support code from svidl (in a follow-up commit).
    
    Change-Id: Ib6654d34e2f8aa8ebd0bd3c41aa2a86e30e9a634

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index ccf5b74e152b..68d63700c0b3 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -226,7 +226,7 @@ SfxVoidItem AlignBottom SID_ALIGNBOTTOM
 ]
 
 
-SfxVoidItem AlignHorizontalCenter SID_ALIGNCENTERHOR
+SfxStringItem AlignHorizontalCenter SID_ALIGNCENTERHOR
 ()
 [
     AutoUpdate = FALSE,
@@ -237,8 +237,6 @@ SfxVoidItem AlignHorizontalCenter SID_ALIGNCENTERHOR
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3689,7 +3687,7 @@ SfxStringItem NumberFormat SID_NUMBER_FORMAT
 ]
 
 
-SfxVoidItem NumberFormatCurrency SID_NUMBER_CURRENCY
+SfxBoolItem NumberFormatCurrency SID_NUMBER_CURRENCY
 (SfxUInt32Item NumberFormatCurrency SID_NUMBER_CURRENCY)
 [
     AutoUpdate = FALSE,
@@ -3699,7 +3697,6 @@ SfxVoidItem NumberFormatCurrency SID_NUMBER_CURRENCY
     Container = FALSE,
     RecordAbsolute = FALSE,
     RecordPerSet;
-    SlotType = SfxBoolItem
 
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -6348,7 +6345,7 @@ SfxVoidItem InsertFieldDateVariable SID_INSERT_FIELD_DATE_VAR
 ]
 
 
-SfxVoidItem OpenFromCalc SID_OPEN_CALC
+SfxStringItem OpenFromCalc SID_OPEN_CALC
 ()
 [
     AutoUpdate = FALSE,
@@ -6360,15 +6357,13 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = FALSE,
     GroupId = GID_OPTIONS;
 ]
 
-SfxVoidItem ConvertFormulaToValue SID_CONVERT_FORMULA_TO_VALUE
+SfxStringItem ConvertFormulaToValue SID_CONVERT_FORMULA_TO_VALUE
 ()
 [
     AutoUpdate = FALSE,
@@ -6379,8 +6374,6 @@ SfxVoidItem ConvertFormulaToValue SID_CONVERT_FORMULA_TO_VALUE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = FALSE,
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 980e5b744bc7..a83b0149db19 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1292,9 +1292,9 @@ interface DrawView
     [
         ExecMethod = FuPermanent ;
     ]
-    SID_FM_CREATE_FIELDCONTROL
+    SfxBoolItem CreateFieldControl SID_FM_CREATE_FIELDCONTROL
+    ()
     [
-    SlotType = SfxBoolItem ;
         ExecMethod = FuPermanent ;
     ]
     SID_ATTR_YEAR2000
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 9f134a2c887a..501de6597102 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -2297,7 +2297,7 @@ SfxVoidItem InteractiveTransparence SID_OBJECT_TRANSPARENCE
     GroupId = GID_MODIFY;
 ]
 
-SfxVoidItem LayerMode SID_LAYERMODE
+SfxBoolItem LayerMode SID_LAYERMODE
 (SfxBoolItem IsActive ID_VAL_ISACTIVE,SfxUInt32Item WhatLayer ID_VAL_WHATLAYER)
 [
     AutoUpdate = FALSE,
@@ -2308,8 +2308,6 @@ SfxVoidItem LayerMode SID_LAYERMODE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2420,7 +2418,7 @@ SfxVoidItem ManageLinks SID_MANAGE_LINKS
     GroupId = GID_EDIT;
 ]
 
-SfxVoidItem MasterPage SID_MASTERPAGE
+SfxBoolItem MasterPage SID_MASTERPAGE
 (SfxBoolItem Isactive ID_VAL_ISACTIVE)
 [
     AutoUpdate = FALSE,
@@ -2431,8 +2429,6 @@ SfxVoidItem MasterPage SID_MASTERPAGE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2987,7 +2983,7 @@ SfxVoidItem PageMargin SID_PAGEMARGIN
     GroupId = GID_MODIFY;
 ]
 
-SfxVoidItem PageMode SID_PAGEMODE
+SfxBoolItem PageMode SID_PAGEMODE
 (SfxBoolItem IsActive ID_VAL_ISACTIVE,SfxUInt32Item WhatKind ID_VAL_WHATKIND)
 [
     AutoUpdate = FALSE,
@@ -2998,8 +2994,6 @@ SfxVoidItem PageMode SID_PAGEMODE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3843,7 +3837,7 @@ SfxVoidItem ZoomMode SID_ZOOM_MODE
     GroupId = GID_VIEW;
 ]
 
-SfxVoidItem Mirror SID_OBJECT_MIRROR
+SfxBoolItem Mirror SID_OBJECT_MIRROR
 ( SfxBoolItem MirrorVert ID_VAL_MIRRORVERT )
 [
     AutoUpdate = TRUE,
@@ -3854,8 +3848,6 @@ SfxVoidItem Mirror SID_OBJECT_MIRROR
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 1c4002c3ff9c..1ffd526663b5 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -191,7 +191,7 @@ SfxUInt16Item ActualStyleFamily SID_STYLE_FAMILY
 ]
 
 
-SfxVoidItem NewDoc SID_NEWDOC
+SfxStringItem NewDoc SID_NEWDOC
 (SfxStringItem Region SID_TEMPLATE_REGIONNAME,SfxStringItem Name SID_TEMPLATE_NAME)
 [
     AutoUpdate = FALSE,
@@ -203,8 +203,6 @@ SfxVoidItem NewDoc SID_NEWDOC
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -230,7 +228,7 @@ SfxVoidItem AddBookmark SID_CREATELINK
 ]
 
 
-SfxVoidItem AddDirect SID_NEWDOCDIRECT
+SfxStringItem AddDirect SID_NEWDOCDIRECT
 ()
 [
     AutoUpdate = FALSE,
@@ -242,8 +240,6 @@ SfxVoidItem AddDirect SID_NEWDOCDIRECT
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -307,7 +303,7 @@ SfxStringItem Author SID_DOCINFO_AUTHOR
     GroupId = ;
 ]
 
-SfxVoidItem AutoPilotMenu SID_AUTOPILOTMENU
+SfxStringItem AutoPilotMenu SID_AUTOPILOTMENU
 ()
 [
     AutoUpdate = FALSE,
@@ -318,8 +314,6 @@ SfxVoidItem AutoPilotMenu SID_AUTOPILOTMENU
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -497,7 +491,7 @@ SfxVoidItem BreakPointsChanged SID_BASICIDE_BRKPNTSCHANGED
 ]
 
 
-SfxVoidItem BrowseBackward SID_BROWSE_BACKWARD
+SfxStringItem BrowseBackward SID_BROWSE_BACKWARD
 (SfxUInt16Item nSteps SID_BROWSE_BACKWARD)
 [
     AutoUpdate = TRUE,
@@ -509,8 +503,6 @@ SfxVoidItem BrowseBackward SID_BROWSE_BACKWARD
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -518,7 +510,7 @@ SfxVoidItem BrowseBackward SID_BROWSE_BACKWARD
 ]
 
 
-SfxVoidItem BrowseForward SID_BROWSE_FORWARD
+SfxStringItem BrowseForward SID_BROWSE_FORWARD
 (SfxUInt16Item nSteps SID_BROWSE_FORWARD)
 [
     AutoUpdate = TRUE,
@@ -530,8 +522,6 @@ SfxVoidItem BrowseForward SID_BROWSE_FORWARD
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -631,7 +621,7 @@ SfxVoidItem CloseDocs SID_CLOSEDOCS
 ]
 
 
-SfxVoidItem CloseDoc SID_CLOSEDOC
+SfxStringItem CloseDoc SID_CLOSEDOC
 (SfxBoolItem saveChanges SID_CLOSEDOC_SAVE,SfxStringItem fileName SID_CLOSEDOC_FILENAME)
 [
     AutoUpdate = FALSE,
@@ -643,8 +633,6 @@ SfxVoidItem CloseDoc SID_CLOSEDOC
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -1174,7 +1162,7 @@ SfxStringItem FileName SID_FILE_NAME
 ]
 
 
-SfxVoidItem FocusUrlBox SID_FOCUSURLBOX
+SfxStringItem FocusUrlBox SID_FOCUSURLBOX
 ()
 [
     AutoUpdate = FALSE,
@@ -1185,8 +1173,6 @@ SfxVoidItem FocusUrlBox SID_FOCUSURLBOX
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -2005,7 +1991,7 @@ SfxBoolItem IsLoadingImages SID_IMG_LOADING
 ]
 
 
-SfxVoidItem PrintOut SID_PRINTOUT
+SfxBoolItem PrintOut SID_PRINTOUT
 (SfxInt16Item copies SID_PRINT_COPIES,SfxBoolItem silent SID_SILENT)
 [
     AutoUpdate = FALSE,
@@ -2016,8 +2002,6 @@ SfxVoidItem PrintOut SID_PRINTOUT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -2062,7 +2046,7 @@ SfxStringItem Keywords SID_DOCINFO_KEYWORDS
 ]
 
 
-SfxVoidItem LibLoaded SID_BASICIDE_LIBLOADED
+SfxStringItem LibLoaded SID_BASICIDE_LIBLOADED
 (SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
 [
     AutoUpdate = FALSE,
@@ -2073,8 +2057,6 @@ SfxVoidItem LibLoaded SID_BASICIDE_LIBLOADED
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -2082,7 +2064,7 @@ SfxVoidItem LibLoaded SID_BASICIDE_LIBLOADED
 ]
 
 
-SfxVoidItem LibRemoved SID_BASICIDE_LIBREMOVED
+SfxStringItem LibRemoved SID_BASICIDE_LIBREMOVED
 (SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
 [
     AutoUpdate = FALSE,
@@ -2093,8 +2075,6 @@ SfxVoidItem LibRemoved SID_BASICIDE_LIBREMOVED
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -2102,7 +2082,7 @@ SfxVoidItem LibRemoved SID_BASICIDE_LIBREMOVED
 ]
 
 
-SfxVoidItem LibSelect SID_BASICIDE_LIBSELECTED
+SfxStringItem LibSelect SID_BASICIDE_LIBSELECTED
 (SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
 [
     AutoUpdate = FALSE,
@@ -2113,8 +2093,6 @@ SfxVoidItem LibSelect SID_BASICIDE_LIBSELECTED
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -2255,7 +2233,7 @@ SfxVoidItem LoadToolBox SID_TOOLBOXOPTIONS
 ]
 
 
-SfxVoidItem Logout SID_LOGOUT
+SfxStringItem Logout SID_LOGOUT
 ()
 [
     AutoUpdate = FALSE,
@@ -2267,8 +2245,6 @@ SfxVoidItem Logout SID_LOGOUT
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -2276,7 +2252,7 @@ SfxVoidItem Logout SID_LOGOUT
 ]
 
 
-SfxVoidItem ScriptOrganizer SID_SCRIPTORGANIZER
+SfxScriptOrganizerItem ScriptOrganizer SID_SCRIPTORGANIZER
 (SfxScriptOrganizerItem ScriptOrganizer SID_SCRIPTORGANIZER)
 [
     AutoUpdate = FALSE,
@@ -2287,8 +2263,6 @@ SfxVoidItem ScriptOrganizer SID_SCRIPTORGANIZER
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxScriptOrganizerItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2296,7 +2270,7 @@ SfxVoidItem ScriptOrganizer SID_SCRIPTORGANIZER
 ]
 
 
-SfxVoidItem MacroOrganizer SID_MACROORGANIZER
+SfxScriptOrganizerItem MacroOrganizer SID_MACROORGANIZER
 (SfxUInt16Item TabId SID_MACROORGANIZER)
 [
     AutoUpdate = FALSE,
@@ -2307,8 +2281,6 @@ SfxVoidItem MacroOrganizer SID_MACROORGANIZER
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxScriptOrganizerItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2931,9 +2903,6 @@ SfxStringItem OpenUrl SID_OPENURL
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -3033,7 +3002,7 @@ SfxVoidItem Paste SID_PASTE
 ]
 
 
-SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS
+SvxClipboardFormatItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS
 (SfxUInt32Item SelectedFormat SID_CLIPBOARD_FORMAT_ITEMS)
 [
     AutoUpdate = FALSE,
@@ -3044,8 +3013,6 @@ SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SvxClipboardFormatItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -3275,7 +3242,7 @@ SfxVoidItem SetDocumentProperties SID_DOCINFO
 ]
 
 
-SfxVoidItem Quit SID_QUITAPP
+SfxStringItem Quit SID_QUITAPP
 ()
 [
     AutoUpdate = FALSE,
@@ -3287,8 +3254,6 @@ SfxVoidItem Quit SID_QUITAPP
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3371,7 +3336,7 @@ SfxBoolItem MacroRecordingFloat SID_RECORDING_FLOATWINDOW
 ]
 
 
-SfxVoidItem Redo SID_REDO
+SfxStringItem Redo SID_REDO
 ( SfxUInt16Item Redo SID_REDO, SfxBoolItem Repair SID_REPAIRPACKAGE )
 [
     AutoUpdate = FALSE,
@@ -3382,15 +3347,13 @@ SfxVoidItem Redo SID_REDO
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_EDIT;
 ]
 
-SfxVoidItem Reload SID_RELOAD
+SfxBoolItem Reload SID_RELOAD
 ()
 [
     AutoUpdate = TRUE,
@@ -3402,8 +3365,6 @@ SfxVoidItem Reload SID_RELOAD
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3467,7 +3428,7 @@ SfxVoidItem Repaint SID_REPAINT
 ]
 
 
-SfxVoidItem Repeat SID_REPEAT
+SfxStringItem Repeat SID_REPEAT
 ()
 [
     AutoUpdate = FALSE,
@@ -3478,8 +3439,6 @@ SfxVoidItem Repeat SID_REPEAT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3540,7 +3499,7 @@ SfxVoidItem SaveSimple SID_SAVESIMPLE
     GroupId = GID_DOCUMENT;
 ]
 
-SfxVoidItem Save SID_SAVEDOC
+SfxStringItem Save SID_SAVEDOC
 (SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem Author SID_DOCINFO_AUTHOR,SfxBoolItem DontTerminateEdit FN_PARAM_1)
 [
     AutoUpdate = FALSE,
@@ -3552,8 +3511,6 @@ SfxVoidItem Save SID_SAVEDOC
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3579,7 +3536,7 @@ SfxVoidItem SaveAll SID_SAVEDOCS
 ]
 
 
-SfxVoidItem SaveAs SID_SAVEASDOC
+SfxStringItem SaveAs SID_SAVEASDOC
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxBoolItem PasswordInteraction SID_PASSWORDINTERACTION,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem VersionAuthor SID_DOCINFO_AUTHOR,SfxBoolItem Overwrite SID_OVERWRITE,SfxBoolItem Unpacked SID_UNPACK,SfxBoolItem SaveTo SID_SAVETO)
 [
     AutoUpdate = FALSE,
@@ -3590,15 +3547,13 @@ SfxVoidItem SaveAs SID_SAVEASDOC
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_DOCUMENT;
 ]
 
-SfxVoidItem SaveAsRemote SID_SAVEASREMOTE
+SfxStringItem SaveAsRemote SID_SAVEASREMOTE
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxBoolItem PasswordInteraction SID_PASSWORDINTERACTION,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem VersionAuthor SID_DOCINFO_AUTHOR,SfxBoolItem Overwrite SID_OVERWRITE,SfxBoolItem Unpacked SID_UNPACK,SfxBoolItem SaveTo SID_SAVETO)
 [
     AutoUpdate = FALSE,
@@ -3609,8 +3564,6 @@ SfxVoidItem SaveAsRemote SID_SAVEASREMOTE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3894,7 +3847,7 @@ SfxVoidItem SendFax FN_FAX
 ]
 
 
-SfxVoidItem SendMail SID_MAIL_SENDDOC
+SfxStringItem SendMail SID_MAIL_SENDDOC
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY )
 [
     AutoUpdate = FALSE,
@@ -3906,15 +3859,13 @@ SfxVoidItem SendMail SID_MAIL_SENDDOC
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_DOCUMENT;
 ]
 
-SfxVoidItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF
+SfxStringItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY)
 [
     AutoUpdate = FALSE,
@@ -3926,15 +3877,13 @@ SfxVoidItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_DOCUMENT;
 ]
 
-SfxVoidItem SendViaBluetooth SID_BLUETOOTH_SENDDOC
+SfxStringItem SendViaBluetooth SID_BLUETOOTH_SENDDOC
 ()
 [
     AutoUpdate = FALSE,
@@ -3946,8 +3895,6 @@ SfxVoidItem SendViaBluetooth SID_BLUETOOTH_SENDDOC
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3955,7 +3902,7 @@ SfxVoidItem SendViaBluetooth SID_BLUETOOTH_SENDDOC
 ]
 
 
-SfxVoidItem SendMailDocAsFormat SID_MAIL_SENDDOCASFORMAT
+SfxStringItem SendMailDocAsFormat SID_MAIL_SENDDOCASFORMAT
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxStringItem TypeName SID_TYPE_NAME)
 [
     AutoUpdate = FALSE,
@@ -3967,15 +3914,13 @@ SfxVoidItem SendMailDocAsFormat SID_MAIL_SENDDOCASFORMAT
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
         AccelConfig = FALSE,
         MenuConfig = FALSE,
         ToolBoxConfig = FALSE,
     GroupId = GID_DOCUMENT;
 ]
 
-SfxVoidItem SendMailDocAsMS SID_MAIL_SENDDOCASMS
+SfxStringItem SendMailDocAsMS SID_MAIL_SENDDOCASMS
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY)
 [
     AutoUpdate = FALSE,
@@ -3987,15 +3932,13 @@ SfxVoidItem SendMailDocAsMS SID_MAIL_SENDDOCASMS
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_DOCUMENT;
 ]
 
-SfxVoidItem SendMailDocAsOOo SID_MAIL_SENDDOCASOOO
+SfxStringItem SendMailDocAsOOo SID_MAIL_SENDDOCASOOO
 (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY)
 [
     AutoUpdate = FALSE,
@@ -4007,8 +3950,6 @@ SfxVoidItem SendMailDocAsOOo SID_MAIL_SENDDOCASOOO
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -4237,7 +4178,7 @@ SfxVoidItem StylePreview SID_STYLE_PREVIEW
 ]
 
 
-SfxVoidItem StyleApply SID_STYLE_APPLY
+SfxTemplateItem StyleApply SID_STYLE_APPLY
 (SfxStringItem Template SID_STYLE_APPLY,SfxUInt16Item Family SID_STYLE_FAMILY,SfxStringItem FamilyName SID_STYLE_FAMILYNAME,SfxStringItem Style SID_APPLY_STYLE)
 [
     AutoUpdate = FALSE,
@@ -4248,8 +4189,6 @@ SfxVoidItem StyleApply SID_STYLE_APPLY
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxTemplateItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -4441,7 +4380,7 @@ SfxVoidItem BasicIDEShowWindow SID_BASICIDE_SHOWWINDOW
 ]
 
 
-SfxVoidItem Undo SID_UNDO
+SfxStringItem Undo SID_UNDO
 ( SfxUInt16Item Undo SID_UNDO, SfxBoolItem Repair SID_REPAIRPACKAGE )
 [
     AutoUpdate = FALSE,
@@ -4452,8 +4391,6 @@ SfxVoidItem Undo SID_UNDO
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -4461,7 +4398,7 @@ SfxVoidItem Undo SID_UNDO
 ]
 
 
-SfxVoidItem FormatPaintbrush SID_FORMATPAINTBRUSH ( SfxBoolItem PersistentCopy SID_FORMATPAINTBRUSH )
+SfxBoolItem FormatPaintbrush SID_FORMATPAINTBRUSH ( SfxBoolItem PersistentCopy SID_FORMATPAINTBRUSH )
 [
       AutoUpdate = TRUE,
       FastCall = FALSE,
@@ -4471,8 +4408,6 @@ SfxVoidItem FormatPaintbrush SID_FORMATPAINTBRUSH ( SfxBoolItem PersistentCopy S
       RecordAbsolute = FALSE,
       RecordPerSet;
 
-      SlotType = SfxBoolItem
-
       AccelConfig = TRUE,
       MenuConfig = TRUE,
       ToolBoxConfig = TRUE,
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 92e42a631c0c..e9249c4cea6e 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -15,7 +15,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-SfxVoidItem AbsoluteRecord SID_FM_RECORD_ABSOLUTE
+SfxInt32Item AbsoluteRecord SID_FM_RECORD_ABSOLUTE
 (SfxInt32Item Position FN_PARAM_1)
 [
     AutoUpdate = TRUE,
@@ -26,8 +26,6 @@ SfxVoidItem AbsoluteRecord SID_FM_RECORD_ABSOLUTE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxInt32Item
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -235,7 +233,7 @@ SfxVoidItem AlignUp SID_OBJECT_ALIGN_UP
 ]
 
 
-SfxVoidItem Arc SID_DRAW_ARC
+SfxBoolItem Arc SID_DRAW_ARC
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -246,8 +244,6 @@ SfxVoidItem Arc SID_DRAW_ARC
     RecordAbsolute = FALSE,
     RecordPerItem;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -332,7 +328,7 @@ SfxVoidItem AutoFormat SID_AUTOFORMAT
 
 
 
-SfxVoidItem BackgroundImage SID_GALLERY_BG_BRUSH
+SfxStringItem BackgroundImage SID_GALLERY_BG_BRUSH
 (SvxBrushItem Background SID_GALLERY_BG_BRUSH, SfxUInt16Item Position SID_GALLERY_BG_POS)
 [
     AutoUpdate = FALSE,
@@ -343,8 +339,6 @@ SfxVoidItem BackgroundImage SID_GALLERY_BG_BRUSH
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -885,7 +879,7 @@ SvxBoxItem BorderOuter SID_ATTR_BORDER_OUTER
 ]
 
 
-SfxVoidItem SetBorderStyle SID_ATTR_BORDER
+SvxBoxItem SetBorderStyle SID_ATTR_BORDER
 (SvxBoxItem OuterBorder SID_ATTR_BORDER_OUTER,SvxBoxInfoItem InnerBorder SID_ATTR_BORDER_INNER)
 [
     AutoUpdate = TRUE,
@@ -896,8 +890,6 @@ SfxVoidItem SetBorderStyle SID_ATTR_BORDER
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SvxBoxItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -1357,7 +1349,7 @@ SfxVoidItem ChooseControls SID_CHOOSE_CONTROLS
 ]
 
 
-SfxVoidItem Circle SID_DRAW_CIRCLE
+SfxBoolItem Circle SID_DRAW_CIRCLE
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y)
 [
     AutoUpdate = TRUE,
@@ -1367,8 +1359,6 @@ SfxVoidItem Circle SID_DRAW_CIRCLE
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -1376,7 +1366,7 @@ SfxVoidItem Circle SID_DRAW_CIRCLE
 ]
 
 
-SfxVoidItem Circle_Unfilled SID_DRAW_CIRCLE_NOFILL
+SfxBoolItem Circle_Unfilled SID_DRAW_CIRCLE_NOFILL
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y)
 [
     AutoUpdate = TRUE,
@@ -1386,8 +1376,6 @@ SfxVoidItem Circle_Unfilled SID_DRAW_CIRCLE_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -1395,7 +1383,7 @@ SfxVoidItem Circle_Unfilled SID_DRAW_CIRCLE_NOFILL
 ]
 
 
-SfxVoidItem CircleArc SID_DRAW_CIRCLEARC
+SfxBoolItem CircleArc SID_DRAW_CIRCLEARC
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -1405,8 +1393,6 @@ SfxVoidItem CircleArc SID_DRAW_CIRCLEARC
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -1414,7 +1400,7 @@ SfxVoidItem CircleArc SID_DRAW_CIRCLEARC
 ]
 
 
-SfxVoidItem CircleCut SID_DRAW_CIRCLECUT
+SfxBoolItem CircleCut SID_DRAW_CIRCLECUT
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -1425,8 +1411,6 @@ SfxVoidItem CircleCut SID_DRAW_CIRCLECUT
     RecordAbsolute = FALSE,
     RecordPerItem;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -1434,7 +1418,7 @@ SfxVoidItem CircleCut SID_DRAW_CIRCLECUT
 ]
 
 
-SfxVoidItem CircleCut_Unfilled SID_DRAW_CIRCLECUT_NOFILL
+SfxBoolItem CircleCut_Unfilled SID_DRAW_CIRCLECUT_NOFILL
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -1444,8 +1428,6 @@ SfxVoidItem CircleCut_Unfilled SID_DRAW_CIRCLECUT_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -1453,7 +1435,7 @@ SfxVoidItem CircleCut_Unfilled SID_DRAW_CIRCLECUT_NOFILL
 ]
 
 
-SfxVoidItem CirclePie SID_DRAW_CIRCLEPIE
+SfxBoolItem CirclePie SID_DRAW_CIRCLEPIE
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -1463,8 +1445,6 @@ SfxVoidItem CirclePie SID_DRAW_CIRCLEPIE
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -1472,7 +1452,7 @@ SfxVoidItem CirclePie SID_DRAW_CIRCLEPIE
 ]
 
 
-SfxVoidItem CirclePie_Unfilled SID_DRAW_CIRCLEPIE_NOFILL
+SfxBoolItem CirclePie_Unfilled SID_DRAW_CIRCLEPIE_NOFILL
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -1482,8 +1462,6 @@ SfxVoidItem CirclePie_Unfilled SID_DRAW_CIRCLEPIE_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2114,7 +2092,7 @@ SfxBoolItem ConvertToNavigationBar SID_FM_CONVERTTO_NAVIGATIONBAR
 ]
 
 
-SfxVoidItem CreateControl SID_FM_CREATE_CONTROL
+SfxBoolItem CreateControl SID_FM_CREATE_CONTROL
 ()
 [
     AutoUpdate = TRUE,
@@ -2125,8 +2103,6 @@ SfxVoidItem CreateControl SID_FM_CREATE_CONTROL
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -2228,7 +2204,7 @@ SfxBoolItem DateField SID_FM_DATEFIELD
 ]
 
 
-SfxVoidItem DefaultBullet FN_NUM_BULLET_ON
+SfxBoolItem DefaultBullet FN_NUM_BULLET_ON
 (SfxBoolItem On FN_PARAM_1)
 [
     AutoUpdate = FALSE,
@@ -2239,8 +2215,6 @@ SfxVoidItem DefaultBullet FN_NUM_BULLET_ON
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2248,7 +2222,7 @@ SfxVoidItem DefaultBullet FN_NUM_BULLET_ON
 ]
 
 
-SfxVoidItem DeleteRecord SID_FM_RECORD_DELETE
+SfxBoolItem DeleteRecord SID_FM_RECORD_DELETE
 ()
 [
     AutoUpdate = TRUE,
@@ -2259,8 +2233,6 @@ SfxVoidItem DeleteRecord SID_FM_RECORD_DELETE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2402,7 +2374,7 @@ SfxBoolItem InsertEdit SID_INSERT_EDIT
 ]
 
 
-SfxVoidItem Ellipse SID_DRAW_ELLIPSE
+SfxBoolItem Ellipse SID_DRAW_ELLIPSE
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y)
 [
     AutoUpdate = TRUE,
@@ -2413,8 +2385,6 @@ SfxVoidItem Ellipse SID_DRAW_ELLIPSE
     RecordAbsolute = FALSE,
     RecordPerItem;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2422,7 +2392,7 @@ SfxVoidItem Ellipse SID_DRAW_ELLIPSE
 ]
 
 
-SfxVoidItem Ellipse_Unfilled SID_DRAW_ELLIPSE_NOFILL
+SfxBoolItem Ellipse_Unfilled SID_DRAW_ELLIPSE_NOFILL
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y)
 [
     AutoUpdate = TRUE,
@@ -2432,8 +2402,6 @@ SfxVoidItem Ellipse_Unfilled SID_DRAW_ELLIPSE_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2441,7 +2409,7 @@ SfxVoidItem Ellipse_Unfilled SID_DRAW_ELLIPSE_NOFILL
 ]
 
 
-SfxVoidItem EllipseCut SID_DRAW_ELLIPSECUT
+SfxBoolItem EllipseCut SID_DRAW_ELLIPSECUT
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -2451,8 +2419,6 @@ SfxVoidItem EllipseCut SID_DRAW_ELLIPSECUT
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2460,7 +2426,7 @@ SfxVoidItem EllipseCut SID_DRAW_ELLIPSECUT
 ]
 
 
-SfxVoidItem EllipseCut_Unfilled SID_DRAW_ELLIPSECUT_NOFILL
+SfxBoolItem EllipseCut_Unfilled SID_DRAW_ELLIPSECUT_NOFILL
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -2470,8 +2436,6 @@ SfxVoidItem EllipseCut_Unfilled SID_DRAW_ELLIPSECUT_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2798,7 +2762,7 @@ SfxVoidItem FilterCrit SID_FM_FILTERCRIT
 ]
 
 
-SfxVoidItem FirstRecord SID_FM_RECORD_FIRST
+SfxBoolItem FirstRecord SID_FM_RECORD_FIRST
 ()
 [
     AutoUpdate = TRUE,
@@ -2809,8 +2773,6 @@ SfxVoidItem FirstRecord SID_FM_RECORD_FIRST
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3382,7 +3344,7 @@ SfxVoidItem FormFilter SID_FM_FILTER_START
 ]
 
 
-SfxVoidItem FormFiltered SID_FM_FORM_FILTERED
+SfxBoolItem FormFiltered SID_FM_FORM_FILTERED
 ()
 [
     AutoUpdate = TRUE,
@@ -3393,8 +3355,6 @@ SfxVoidItem FormFiltered SID_FM_FORM_FILTERED
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -4345,7 +4305,7 @@ SfxVoidItem RotateRight SID_ROTATE_GRAPHIC_RIGHT
     GroupId = GID_GRAPHIC;
 ]
 
-SfxVoidItem Crop SID_OBJECT_CROP
+SfxBoolItem Crop SID_OBJECT_CROP
 ()
 [
     AutoUpdate = TRUE,
@@ -4356,8 +4316,6 @@ SfxVoidItem Crop SID_OBJECT_CROP
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -4692,7 +4650,7 @@ SfxBoolItem InsertMode SID_ATTR_INSERT
 ]
 
 
-SfxVoidItem DefaultNumbering FN_NUM_NUMBERING_ON
+SfxBoolItem DefaultNumbering FN_NUM_NUMBERING_ON
 (SfxBoolItem On FN_PARAM_1)
 [
     AutoUpdate = FALSE,
@@ -4703,8 +4661,6 @@ SfxVoidItem DefaultNumbering FN_NUM_NUMBERING_ON
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -4837,7 +4793,7 @@ SfxVoidItem InsertSpreadsheet SID_ATTR_TABLE
 
 
 
-SfxVoidItem InsertTable SID_INSERT_TABLE
+SfxUInt16Item InsertTable SID_INSERT_TABLE
 (SfxUInt16Item Columns SID_ATTR_TABLE_COLUMN,SfxUInt16Item Rows SID_ATTR_TABLE_ROW )
 [
     AutoUpdate = FALSE,
@@ -4849,8 +4805,6 @@ SfxVoidItem InsertTable SID_INSERT_TABLE
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxUInt16Item
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -5082,7 +5036,7 @@ SvxLanguageItem LanguageLatin SID_ATTR_CHAR_LATIN_LANGUAGE
 ]
 
 
-SfxVoidItem LastRecord SID_FM_RECORD_LAST
+SfxBoolItem LastRecord SID_FM_RECORD_LAST
 ()
 [
     AutoUpdate = TRUE,
@@ -5093,8 +5047,6 @@ SfxVoidItem LastRecord SID_FM_RECORD_LAST
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -5175,7 +5127,7 @@ SvxLRSpaceItem LeftRightMargin SID_ATTR_LRSPACE
 ]
 
 
-SfxVoidItem LeftRightParaMargin SID_ATTR_PARA_LRSPACE
+SvxLRSpaceItem LeftRightParaMargin SID_ATTR_PARA_LRSPACE
 (SvxLRSpaceItem LRSpace SID_ATTR_PARA_LRSPACE)
 [
     AutoUpdate = FALSE,
@@ -5186,8 +5138,6 @@ SfxVoidItem LeftRightParaMargin SID_ATTR_PARA_LRSPACE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SvxLRSpaceItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -5195,7 +5145,7 @@ SfxVoidItem LeftRightParaMargin SID_ATTR_PARA_LRSPACE
 ]
 
 
-SfxVoidItem LeftParaMargin SID_ATTR_PARA_LEFTSPACE
+SvxLRSpaceItem LeftParaMargin SID_ATTR_PARA_LEFTSPACE
 
 [
     AutoUpdate = FALSE,
@@ -5206,8 +5156,6 @@ SfxVoidItem LeftParaMargin SID_ATTR_PARA_LEFTSPACE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SvxLRSpaceItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -5215,7 +5163,7 @@ SfxVoidItem LeftParaMargin SID_ATTR_PARA_LEFTSPACE
 ]
 
 
-SfxVoidItem FirstLineParaMargin SID_ATTR_PARA_FIRSTLINESPACE
+SvxLRSpaceItem FirstLineParaMargin SID_ATTR_PARA_FIRSTLINESPACE
 
 [
     AutoUpdate = FALSE,
@@ -5226,8 +5174,6 @@ SfxVoidItem FirstLineParaMargin SID_ATTR_PARA_FIRSTLINESPACE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SvxLRSpaceItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -5235,7 +5181,7 @@ SfxVoidItem FirstLineParaMargin SID_ATTR_PARA_FIRSTLINESPACE
 ]
 
 
-SfxVoidItem RightParaMargin SID_ATTR_PARA_RIGHTSPACE
+SvxLRSpaceItem RightParaMargin SID_ATTR_PARA_RIGHTSPACE
 
 [
     AutoUpdate = FALSE,
@@ -5246,8 +5192,6 @@ SfxVoidItem RightParaMargin SID_ATTR_PARA_RIGHTSPACE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SvxLRSpaceItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -5509,7 +5453,7 @@ XLineDashItem LineDash SID_ATTR_LINE_DASH
 ]
 
 
-SfxVoidItem LineEndStyle SID_ATTR_LINEEND_STYLE
+SfxBoolItem LineEndStyle SID_ATTR_LINEEND_STYLE
 (XLineStartItem LineStart SID_ATTR_LINE_START,XLineEndItem LineEnd SID_ATTR_LINE_END,SfxUInt32Item StartWidth SID_ATTR_LINE_STARTWIDTH,SfxUInt32Item EndWidth SID_ATTR_LINE_ENDWIDTH)
 [
     AutoUpdate = FALSE,
@@ -5520,8 +5464,6 @@ SfxVoidItem LineEndStyle SID_ATTR_LINEEND_STYLE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -5699,7 +5641,7 @@ SfxVoidItem Merge SID_POLY_MERGE
 
 
 
-SfxVoidItem NewRecord SID_FM_RECORD_NEW
+SfxBoolItem NewRecord SID_FM_RECORD_NEW
 ()
 [
     AutoUpdate = TRUE,
@@ -5710,8 +5652,6 @@ SfxVoidItem NewRecord SID_FM_RECORD_NEW
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -5719,7 +5659,7 @@ SfxVoidItem NewRecord SID_FM_RECORD_NEW
 ]
 
 
-SfxVoidItem NextRecord SID_FM_RECORD_NEXT
+SfxBoolItem NextRecord SID_FM_RECORD_NEXT
 ()
 [
     AutoUpdate = TRUE,
@@ -5730,8 +5670,6 @@ SfxVoidItem NextRecord SID_FM_RECORD_NEXT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6352,7 +6290,7 @@ SfxBoolItem PatternField SID_FM_PATTERNFIELD
 ]
 
 
-SfxVoidItem Pie SID_DRAW_PIE
+SfxBoolItem Pie SID_DRAW_PIE
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -6363,8 +6301,6 @@ SfxVoidItem Pie SID_DRAW_PIE
     RecordAbsolute = FALSE,
     RecordPerItem;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6372,7 +6308,7 @@ SfxVoidItem Pie SID_DRAW_PIE
 ]
 
 
-SfxVoidItem Pie_Unfilled SID_DRAW_PIE_NOFILL
+SfxBoolItem Pie_Unfilled SID_DRAW_PIE_NOFILL
 (SfxUInt32Item CenterX ID_VAL_CENTER_X,SfxUInt32Item CenterY ID_VAL_CENTER_Y,SfxUInt32Item AxisX ID_VAL_AXIS_X,SfxUInt32Item AxisY ID_VAL_AXIS_Y,SfxUInt32Item StartAngle ID_VAL_ANGLESTART,SfxUInt32Item EndAngle ID_VAL_ANGLEEND)
 [
     AutoUpdate = TRUE,
@@ -6382,8 +6318,6 @@ SfxVoidItem Pie_Unfilled SID_DRAW_PIE_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6464,7 +6398,7 @@ SfxPointItem Position SID_ATTR_POSITION
 ]
 
 
-SfxVoidItem PrevRecord SID_FM_RECORD_PREV
+SfxBoolItem PrevRecord SID_FM_RECORD_PREV
 ()
 [
     AutoUpdate = TRUE,
@@ -6475,8 +6409,6 @@ SfxVoidItem PrevRecord SID_FM_RECORD_PREV
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6751,7 +6683,7 @@ SfxBoolItem ReadOnlyMode SID_READONLY_MODE
 ]
 
 
-SfxVoidItem RecFromText SID_FM_RECORD_FROM_TEXT
+SfxBoolItem RecFromText SID_FM_RECORD_FROM_TEXT
 ()
 [
     AutoUpdate = TRUE,
@@ -6762,8 +6694,6 @@ SfxVoidItem RecFromText SID_FM_RECORD_FROM_TEXT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -6771,7 +6701,7 @@ SfxVoidItem RecFromText SID_FM_RECORD_FROM_TEXT
 ]
 
 
-SfxVoidItem RecSave SID_FM_RECORD_SAVE
+SfxBoolItem RecSave SID_FM_RECORD_SAVE
 ()
 [
     AutoUpdate = TRUE,
@@ -6782,8 +6712,6 @@ SfxVoidItem RecSave SID_FM_RECORD_SAVE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6802,8 +6730,6 @@ SfxVoidItem RecSearch SID_FM_SEARCH
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxVoidItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6811,7 +6737,7 @@ SfxVoidItem RecSearch SID_FM_SEARCH
 ]
 
 
-SfxVoidItem Rect SID_DRAW_RECT
+SfxBoolItem Rect SID_DRAW_RECT
 (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y)
 [
     AutoUpdate = TRUE,
@@ -6822,8 +6748,6 @@ SfxVoidItem Rect SID_DRAW_RECT
     RecordAbsolute = FALSE,
     RecordPerItem;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6831,7 +6755,7 @@ SfxVoidItem Rect SID_DRAW_RECT
 ]
 
 
-SfxVoidItem Rect_Rounded SID_DRAW_RECT_ROUND
+SfxBoolItem Rect_Rounded SID_DRAW_RECT_ROUND
 (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y)
 [
     AutoUpdate = TRUE,
@@ -6841,8 +6765,6 @@ SfxVoidItem Rect_Rounded SID_DRAW_RECT_ROUND
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6850,7 +6772,7 @@ SfxVoidItem Rect_Rounded SID_DRAW_RECT_ROUND
 ]
 
 
-SfxVoidItem Rect_Rounded_Unfilled SID_DRAW_RECT_ROUND_NOFILL
+SfxBoolItem Rect_Rounded_Unfilled SID_DRAW_RECT_ROUND_NOFILL
 (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y)
 [
     AutoUpdate = TRUE,
@@ -6860,8 +6782,6 @@ SfxVoidItem Rect_Rounded_Unfilled SID_DRAW_RECT_ROUND_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6869,7 +6789,7 @@ SfxVoidItem Rect_Rounded_Unfilled SID_DRAW_RECT_ROUND_NOFILL
 ]
 
 
-SfxVoidItem Rect_Unfilled SID_DRAW_RECT_NOFILL
+SfxBoolItem Rect_Unfilled SID_DRAW_RECT_NOFILL
 (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y)
 [
     AutoUpdate = TRUE,
@@ -6879,8 +6799,6 @@ SfxVoidItem Rect_Unfilled SID_DRAW_RECT_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -6888,7 +6806,7 @@ SfxVoidItem Rect_Unfilled SID_DRAW_RECT_NOFILL
 ]
 
 
-SfxVoidItem RecText SID_FM_RECORD_TEXT
+SfxBoolItem RecText SID_FM_RECORD_TEXT
 ()
 [
     AutoUpdate = TRUE,
@@ -6899,8 +6817,6 @@ SfxVoidItem RecText SID_FM_RECORD_TEXT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -6908,7 +6824,7 @@ SfxVoidItem RecText SID_FM_RECORD_TEXT
 ]
 
 
-SfxVoidItem RecTotal SID_FM_RECORD_TOTAL
+SfxStringItem RecTotal SID_FM_RECORD_TOTAL
 ()
 [
     AutoUpdate = TRUE,
@@ -6919,8 +6835,6 @@ SfxVoidItem RecTotal SID_FM_RECORD_TOTAL
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -6928,7 +6842,7 @@ SfxVoidItem RecTotal SID_FM_RECORD_TOTAL
 ]
 
 
-SfxVoidItem RecUndo SID_FM_RECORD_UNDO
+SfxBoolItem RecUndo SID_FM_RECORD_UNDO
 ()
 [
     AutoUpdate = TRUE,
@@ -6939,8 +6853,6 @@ SfxVoidItem RecUndo SID_FM_RECORD_UNDO
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -7443,7 +7355,7 @@ SvxLongLRSpaceItem SetLongLeftRightMargin SID_ATTR_LONG_LRSPACE
 ]
 
 
-SfxVoidItem SetLongTopBottomMargin SID_ATTR_LONG_ULSPACE
+SvxLongULSpaceItem SetLongTopBottomMargin SID_ATTR_LONG_ULSPACE
 (SvxLongULSpaceItem Space SID_ATTR_LONG_ULSPACE)
 [
     AutoUpdate = FALSE,
@@ -7454,8 +7366,6 @@ SfxVoidItem SetLongTopBottomMargin SID_ATTR_LONG_ULSPACE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SvxLongULSpaceItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -7729,7 +7639,7 @@ SfxBoolItem ShowProperties SID_FM_SHOW_PROPERTIES
 ]
 
 
-SfxVoidItem ShowPropertyBrowser SID_FM_SHOW_PROPERTY_BROWSER
+SfxBoolItem ShowPropertyBrowser SID_FM_SHOW_PROPERTY_BROWSER
 ()
 [
     AutoUpdate = TRUE,
@@ -7740,8 +7650,6 @@ SfxVoidItem ShowPropertyBrowser SID_FM_SHOW_PROPERTY_BROWSER
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -7951,7 +7859,7 @@ SfxBoolItem Spinbutton SID_INSERT_SPINBUTTON
 ]
 
 
-SfxVoidItem Square SID_DRAW_SQUARE
+SfxBoolItem Square SID_DRAW_SQUARE
 (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y)
 [
     AutoUpdate = TRUE,
@@ -7961,8 +7869,6 @@ SfxVoidItem Square SID_DRAW_SQUARE
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -7970,7 +7876,7 @@ SfxVoidItem Square SID_DRAW_SQUARE
 ]
 
 
-SfxVoidItem Square_Rounded SID_DRAW_SQUARE_ROUND
+SfxBoolItem Square_Rounded SID_DRAW_SQUARE_ROUND
 (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y)
 [
     AutoUpdate = TRUE,
@@ -7980,8 +7886,6 @@ SfxVoidItem Square_Rounded SID_DRAW_SQUARE_ROUND
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -7989,7 +7893,7 @@ SfxVoidItem Square_Rounded SID_DRAW_SQUARE_ROUND
 ]
 
 
-SfxVoidItem Square_Rounded_Unfilled SID_DRAW_SQUARE_ROUND_NOFILL
+SfxBoolItem Square_Rounded_Unfilled SID_DRAW_SQUARE_ROUND_NOFILL
 (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y)
 [
     AutoUpdate = TRUE,
@@ -7999,8 +7903,6 @@ SfxVoidItem Square_Rounded_Unfilled SID_DRAW_SQUARE_ROUND_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -8008,7 +7910,7 @@ SfxVoidItem Square_Rounded_Unfilled SID_DRAW_SQUARE_ROUND_NOFILL
 ]
 
 
-SfxVoidItem Square_Unfilled SID_DRAW_SQUARE_NOFILL
+SfxBoolItem Square_Unfilled SID_DRAW_SQUARE_NOFILL
 (SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y,SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y)
 [
     AutoUpdate = TRUE,
@@ -8018,8 +7920,6 @@ SfxVoidItem Square_Unfilled SID_DRAW_SQUARE_NOFILL
     Container = FALSE,
     RecordAbsolute = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -8184,9 +8084,6 @@ SfxBoolItem TabDialog SID_FM_TAB_DIALOG
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxBoolItem
-
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -8234,7 +8131,7 @@ SvxTabStopItem TabstopsVertical SID_ATTR_TABSTOP_VERTICAL
 ]
 
 
-SfxVoidItem TestMode SID_DIALOG_TESTMODE
+SfxBoolItem TestMode SID_DIALOG_TESTMODE
 ()
 [
     AutoUpdate = TRUE,
@@ -8246,8 +8143,6 @@ SfxVoidItem TestMode SID_DIALOG_TESTMODE
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -8285,9 +8180,6 @@ SfxBoolItem DrawText SID_DRAW_TEXT
     RecordAbsolute = FALSE,
     RecordPerItem;
 
-    SlotType = SfxBoolItem
-
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -8693,7 +8585,7 @@ SfxBoolItem VFixedLine SID_INSERT_VFIXEDLINE
 ]
 
 
-SfxVoidItem ViewFormAsGrid SID_FM_VIEW_AS_GRID
+SfxBoolItem ViewFormAsGrid SID_FM_VIEW_AS_GRID
 ()
 [
     AutoUpdate = TRUE,
@@ -8704,8 +8596,6 @@ SfxVoidItem ViewFormAsGrid SID_FM_VIEW_AS_GRID
     RecordAbsolute = FALSE,
     RecordPerItem;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -8946,8 +8836,6 @@ SfxVoidItem ToggleControlFocus SID_FM_TOGGLECONTROLFOCUS
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxVoidItem
-
     AccelConfig = TRUE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -8966,8 +8854,6 @@ SfxVoidItem CreateFieldControl SID_FM_CREATE_FIELDCONTROL
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxVoidItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -9579,7 +9465,7 @@ SfxVoidItem ExtrusionTiltRight SID_EXTRUSION_TILT_RIGHT
 ]
 
 
-SfxVoidItem ExtrusionDepthFloater SID_EXTRUSION_DEPTH_FLOATER
+SfxBoolItem ExtrusionDepthFloater SID_EXTRUSION_DEPTH_FLOATER
 ()
 [
     AutoUpdate = FALSE,
@@ -9588,8 +9474,6 @@ SfxVoidItem ExtrusionDepthFloater SID_EXTRUSION_DEPTH_FLOATER
     Toggle = FALSE,
     Container = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -9597,7 +9481,7 @@ SfxVoidItem ExtrusionDepthFloater SID_EXTRUSION_DEPTH_FLOATER
 ]
 
 
-SfxVoidItem ExtrusionDepthDialog SID_EXTRUSION_DEPTH_DIALOG
+SvxDoubleItem ExtrusionDepthDialog SID_EXTRUSION_DEPTH_DIALOG
 (SvxDoubleItem Depth SID_EXTRUSION_DEPTH,SfxUInt16Item Metric SID_ATTR_METRIC)
 [
     AutoUpdate = FALSE,
@@ -9606,8 +9490,6 @@ SfxVoidItem ExtrusionDepthDialog SID_EXTRUSION_DEPTH_DIALOG
     Toggle = FALSE,
     Container = FALSE,
 
-    SlotType = SvxDoubleItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -9615,7 +9497,7 @@ SfxVoidItem ExtrusionDepthDialog SID_EXTRUSION_DEPTH_DIALOG
 ]
 
 
-SfxVoidItem ExtrusionDirectionFloater SID_EXTRUSION_DIRECTION_FLOATER
+SfxBoolItem ExtrusionDirectionFloater SID_EXTRUSION_DIRECTION_FLOATER
 ()
 [
     AutoUpdate = FALSE,
@@ -9624,8 +9506,6 @@ SfxVoidItem ExtrusionDirectionFloater SID_EXTRUSION_DIRECTION_FLOATER
     Toggle = FALSE,
     Container = FALSE,
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -9633,7 +9513,7 @@ SfxVoidItem ExtrusionDirectionFloater SID_EXTRUSION_DIRECTION_FLOATER
 ]
 
 
-SfxVoidItem ExtrusionLightingFloater SID_EXTRUSION_LIGHTING_FLOATER
+SfxBoolItem ExtrusionLightingFloater SID_EXTRUSION_LIGHTING_FLOATER
 ()
 [
     AutoUpdate = FALSE,
@@ -9643,8 +9523,6 @@ SfxVoidItem ExtrusionLightingFloater SID_EXTRUSION_LIGHTING_FLOATER
     Container = FALSE,
     Asynchron;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -9652,7 +9530,7 @@ SfxVoidItem ExtrusionLightingFloater SID_EXTRUSION_LIGHTING_FLOATER
 ]
 
 
-SfxVoidItem ExtrusionSurfaceFloater SID_EXTRUSION_SURFACE_FLOATER
+SfxBoolItem ExtrusionSurfaceFloater SID_EXTRUSION_SURFACE_FLOATER
 ()
 [
     AutoUpdate = FALSE,
@@ -9662,8 +9540,6 @@ SfxVoidItem ExtrusionSurfaceFloater SID_EXTRUSION_SURFACE_FLOATER
     Container = FALSE,
     Asynchron;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -9790,7 +9666,7 @@ SfxInt32Item ExtrusionSurface SID_EXTRUSION_SURFACE
 ]
 
 
-SfxVoidItem FontworkGalleryFloater SID_FONTWORK_GALLERY_FLOATER
+SfxBoolItem FontworkGalleryFloater SID_FONTWORK_GALLERY_FLOATER
 ()
 [
     AutoUpdate = FALSE,
@@ -9800,8 +9676,6 @@ SfxVoidItem FontworkGalleryFloater SID_FONTWORK_GALLERY_FLOATER
     Container = FALSE,
     Asynchron;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -9809,7 +9683,7 @@ SfxVoidItem FontworkGalleryFloater SID_FONTWORK_GALLERY_FLOATER
 ]
 
 
-SfxVoidItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE
+SfxStringItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE
 (SfxStringItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE)
 [
     AutoUpdate = TRUE,
@@ -9820,8 +9694,6 @@ SfxVoidItem FontworkShapeType SID_FONTWORK_SHAPE_TYPE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -9846,7 +9718,7 @@ SfxBoolItem FontworkSameLetterHeights SID_FONTWORK_SAME_LETTER_HEIGHTS
 ]
 
 
-SfxVoidItem FontworkAlignmentFloater SID_FONTWORK_ALIGNMENT_FLOATER
+SfxBoolItem FontworkAlignmentFloater SID_FONTWORK_ALIGNMENT_FLOATER
 ()
 [
     AutoUpdate = FALSE,
@@ -9856,8 +9728,6 @@ SfxVoidItem FontworkAlignmentFloater SID_FONTWORK_ALIGNMENT_FLOATER
     Container = FALSE,
     Asynchron;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -9865,7 +9735,7 @@ SfxVoidItem FontworkAlignmentFloater SID_FONTWORK_ALIGNMENT_FLOATER
 ]
 
 
-SfxVoidItem FontworkCharacterSpacingFloater SID_FONTWORK_CHARACTER_SPACING_FLOATER
+SfxBoolItem FontworkCharacterSpacingFloater SID_FONTWORK_CHARACTER_SPACING_FLOATER
 ()
 [
     AutoUpdate = FALSE,
@@ -9875,8 +9745,6 @@ SfxVoidItem FontworkCharacterSpacingFloater SID_FONTWORK_CHARACTER_SPACING_FLOAT
     Container = FALSE,
     Asynchron;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -9932,7 +9800,7 @@ SfxInt32Item FontworkCharacterSpacing SID_FONTWORK_CHARACTER_SPACING
 ]
 
 
-SfxVoidItem FontworkCharacterSpacingDialog SID_FONTWORK_CHARACTER_SPACING_DIALOG
+SfxInt32Item FontworkCharacterSpacingDialog SID_FONTWORK_CHARACTER_SPACING_DIALOG
 (SfxInt32Item FontworkCharacterSpacing SID_FONTWORK_CHARACTER_SPACING)
 [
     AutoUpdate = FALSE,
@@ -9941,8 +9809,6 @@ SfxVoidItem FontworkCharacterSpacingDialog SID_FONTWORK_CHARACTER_SPACING_DIALOG
     Toggle = FALSE,
     Container = FALSE,
 
-    SlotType = SfxInt32Item
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -10206,7 +10072,7 @@ SfxVoidItem SbaBrwInsert SID_SBA_BRW_INSERT
 ]
 
 
-SfxVoidItem BasicShapes SID_DRAWTBX_CS_BASIC
+SfxStringItem BasicShapes SID_DRAWTBX_CS_BASIC
 (SfxStringItem BasicShapes SID_DRAWTBX_CS_BASIC)
 [
     AutoUpdate = TRUE,
@@ -10217,8 +10083,6 @@ SfxVoidItem BasicShapes SID_DRAWTBX_CS_BASIC
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -10226,7 +10090,7 @@ SfxVoidItem BasicShapes SID_DRAWTBX_CS_BASIC
 ]
 
 
-SfxVoidItem SymbolShapes SID_DRAWTBX_CS_SYMBOL
+SfxStringItem SymbolShapes SID_DRAWTBX_CS_SYMBOL
 (SfxStringItem SymbolShapes SID_DRAWTBX_CS_SYMBOL)
 [
     AutoUpdate = TRUE,
@@ -10237,8 +10101,6 @@ SfxVoidItem SymbolShapes SID_DRAWTBX_CS_SYMBOL
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -10246,7 +10108,7 @@ SfxVoidItem SymbolShapes SID_DRAWTBX_CS_SYMBOL
 ]
 
 
-SfxVoidItem ArrowShapes SID_DRAWTBX_CS_ARROW
+SfxStringItem ArrowShapes SID_DRAWTBX_CS_ARROW
 (SfxStringItem ArrowShapes SID_DRAWTBX_CS_ARROW)
 [
     AutoUpdate = TRUE,
@@ -10257,8 +10119,6 @@ SfxVoidItem ArrowShapes SID_DRAWTBX_CS_ARROW
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -10266,7 +10126,7 @@ SfxVoidItem ArrowShapes SID_DRAWTBX_CS_ARROW
 ]
 
 
-SfxVoidItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART
+SfxStringItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART
 (SfxStringItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART)
 [
     AutoUpdate = TRUE,
@@ -10277,8 +10137,6 @@ SfxVoidItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -10286,7 +10144,7 @@ SfxVoidItem FlowChartShapes SID_DRAWTBX_CS_FLOWCHART
 ]
 
 
-SfxVoidItem CalloutShapes SID_DRAWTBX_CS_CALLOUT
+SfxStringItem CalloutShapes SID_DRAWTBX_CS_CALLOUT
 (SfxStringItem CalloutShapes SID_DRAWTBX_CS_CALLOUT)
 [
     AutoUpdate = TRUE,
@@ -10297,8 +10155,6 @@ SfxVoidItem CalloutShapes SID_DRAWTBX_CS_CALLOUT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -10306,7 +10162,7 @@ SfxVoidItem CalloutShapes SID_DRAWTBX_CS_CALLOUT
 ]
 
 
-SfxVoidItem StarShapes SID_DRAWTBX_CS_STAR
+SfxStringItem StarShapes SID_DRAWTBX_CS_STAR
 (SfxStringItem StarShapes SID_DRAWTBX_CS_STAR)
 [
     AutoUpdate = TRUE,
@@ -10317,8 +10173,6 @@ SfxVoidItem StarShapes SID_DRAWTBX_CS_STAR
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -10473,7 +10327,7 @@ SvxEmphasisMarkItem EmphasisMark SID_ATTR_CHAR_EMPHASISMARK
 ]
 
 
-SfxVoidItem ShowDataNavigator SID_FM_SHOW_DATANAVIGATOR
+SfxBoolItem ShowDataNavigator SID_FM_SHOW_DATANAVIGATOR
 ()
 [
     AutoUpdate = TRUE,
@@ -10484,8 +10338,6 @@ SfxVoidItem ShowDataNavigator SID_FM_SHOW_DATANAVIGATOR
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -10666,7 +10518,7 @@ SfxVoidItem CommonAlignVerticalDefault SID_ALIGN_ANY_VDEFAULT
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem AVMediaToolBox SID_AVMEDIA_TOOLBOX
+avmedia_MediaItem AVMediaToolBox SID_AVMEDIA_TOOLBOX
 ( avmedia_MediaItem AVMediaToolBox SID_AVMEDIA_TOOLBOX )
 [
     AutoUpdate = FALSE,
@@ -10676,7 +10528,6 @@ SfxVoidItem AVMediaToolBox SID_AVMEDIA_TOOLBOX
     Container = FALSE,
     RecordAbsolute = FALSE,
     RecordPerSet;
-    SlotType = avmedia_MediaItem;
 
     AccelConfig = FALSE,
     MenuConfig = FALSE,
@@ -11181,7 +11032,7 @@ SfxVoidItem TableSort SID_TABLE_SORT_DIALOG
 ]
 
 
-SfxVoidItem OpenSmartTagMenuOnCursor SID_OPEN_SMARTTAGMENU
+SvxSmartTagItem OpenSmartTagMenuOnCursor SID_OPEN_SMARTTAGMENU
 ()
 [
         AutoUpdate = FALSE,
@@ -11191,7 +11042,6 @@ SfxVoidItem OpenSmartTagMenuOnCursor SID_OPEN_SMARTTAGMENU
         Container = FALSE,
         RecordAbsolute = FALSE,
         RecordPerSet;
-        SlotType = SvxSmartTagItem;
 
         AccelConfig = FALSE,
         MenuConfig = TRUE,
@@ -11218,7 +11068,7 @@ SvxZoomSliderItem ZoomSlider SID_ATTR_ZOOMSLIDER
 ]
 
 
-SfxVoidItem LanguageStatus SID_LANGUAGE_STATUS
+SfxStringListItem LanguageStatus SID_LANGUAGE_STATUS
 (SfxStringItem Language SID_LANGUAGE_STATUS)
 [
     AutoUpdate = FALSE,
@@ -11229,8 +11079,6 @@ SfxVoidItem LanguageStatus SID_LANGUAGE_STATUS
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringListItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -11432,7 +11280,7 @@ SfxVoidItem InsertRowsAfter SID_TABLE_INSERT_ROW_AFTER
     GroupId = GID_TABLE;
 ]
 
-SfxVoidItem PrepareMailExport SID_MAIL_PREPAREEXPORT
+SfxBoolItem PrepareMailExport SID_MAIL_PREPAREEXPORT
 ()
 [
     AutoUpdate = FALSE,
@@ -11443,8 +11291,6 @@ SfxVoidItem PrepareMailExport SID_MAIL_PREPAREEXPORT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index d2906533e0bf..0df1825ba2c6 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -308,7 +308,7 @@ interface BaseTextSelection
         DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
     ]
 
-    SfxVoidItem StyleWatercanMode SID_STYLE_WATERCAN // status()
+    SfxBoolItem StyleWatercanMode SID_STYLE_WATERCAN // status()
     (
         SfxStringItem Param SID_STYLE_WATERCAN ,
         SfxUInt16Item Family SID_STYLE_FAMILY
@@ -317,7 +317,6 @@ interface BaseTextSelection
         ExecMethod = Execute ;
         StateMethod = StateStyle ;
         NoRecord;
-        SlotType = SfxBoolItem ;
         GroupId = GID_TEMPLATE ;
         DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
     ]
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 9cea22be76a1..974ae8f9c391 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -19,7 +19,6 @@ interface TextDraw : TextDrawBase
 {
     SID_ATTR_LINEEND_STYLE
     [
-        SlotType = SfxBoolItem ;
         ExecMethod = ExecDrawAttrArgs ;
         StateMethod = DisableState ;
         Export = FALSE;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 7b92648efdcb..04c649c04224 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -102,7 +102,7 @@ SfxVoidItem AddAllUnknownWords FN_ADD_UNKNOWN
     GroupId = GID_OPTIONS;
 ]
 
-SfxVoidItem AlignBottom FN_FRAME_ALIGN_VERT_BOTTOM
+SfxStringItem AlignBottom FN_FRAME_ALIGN_VERT_BOTTOM
 ()
 [
     AutoUpdate = FALSE,
@@ -113,15 +113,13 @@ SfxVoidItem AlignBottom FN_FRAME_ALIGN_VERT_BOTTOM
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FRAME;
 ]
 
-SfxVoidItem AlignCharBottom FN_FRAME_ALIGN_VERT_CHAR_BOTTOM
+SfxStringItem AlignCharBottom FN_FRAME_ALIGN_VERT_CHAR_BOTTOM
 ()
 [
     AutoUpdate = FALSE,
@@ -132,15 +130,13 @@ SfxVoidItem AlignCharBottom FN_FRAME_ALIGN_VERT_CHAR_BOTTOM
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FRAME;
 ]
 
-SfxVoidItem AlignCharTop FN_FRAME_ALIGN_VERT_CHAR_TOP
+SfxStringItem AlignCharTop FN_FRAME_ALIGN_VERT_CHAR_TOP
 ()
 [
     AutoUpdate = FALSE,
@@ -151,8 +147,6 @@ SfxVoidItem AlignCharTop FN_FRAME_ALIGN_VERT_CHAR_TOP
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -210,7 +204,7 @@ SfxVoidItem AlignRight FN_FRAME_ALIGN_HORZ_RIGHT
     GroupId = GID_FRAME;
 ]
 
-SfxVoidItem AlignRowBottom FN_FRAME_ALIGN_VERT_ROW_BOTTOM
+SfxStringItem AlignRowBottom FN_FRAME_ALIGN_VERT_ROW_BOTTOM
 ()
 [
     AutoUpdate = FALSE,
@@ -221,15 +215,13 @@ SfxVoidItem AlignRowBottom FN_FRAME_ALIGN_VERT_ROW_BOTTOM
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FRAME;
 ]
 
-SfxVoidItem AlignRowTop FN_FRAME_ALIGN_VERT_ROW_TOP
+SfxStringItem AlignRowTop FN_FRAME_ALIGN_VERT_ROW_TOP
 ()
 [
     AutoUpdate = FALSE,
@@ -240,15 +232,13 @@ SfxVoidItem AlignRowTop FN_FRAME_ALIGN_VERT_ROW_TOP
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FRAME;
 ]
 
-SfxVoidItem AlignTop FN_FRAME_ALIGN_VERT_TOP
+SfxStringItem AlignTop FN_FRAME_ALIGN_VERT_TOP
 ()
 [
     AutoUpdate = FALSE,
@@ -259,15 +249,13 @@ SfxVoidItem AlignTop FN_FRAME_ALIGN_VERT_TOP
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FRAME;
 ]
 
-SfxVoidItem AlignVerticalCenter FN_FRAME_ALIGN_VERT_CENTER
+SfxStringItem AlignVerticalCenter FN_FRAME_ALIGN_VERT_CENTER
 ()
 [
     AutoUpdate = FALSE,
@@ -278,15 +266,13 @@ SfxVoidItem AlignVerticalCenter FN_FRAME_ALIGN_VERT_CENTER
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FRAME;
 ]
 
-SfxVoidItem AlignVerticalCharCenter FN_FRAME_ALIGN_VERT_CHAR_CENTER
+SfxStringItem AlignVerticalCharCenter FN_FRAME_ALIGN_VERT_CHAR_CENTER
 ()
 [
     AutoUpdate = FALSE,
@@ -297,15 +283,13 @@ SfxVoidItem AlignVerticalCharCenter FN_FRAME_ALIGN_VERT_CHAR_CENTER
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FRAME;
 ]
 
-SfxVoidItem AlignVerticalRowCenter FN_FRAME_ALIGN_VERT_ROW_CENTER
+SfxStringItem AlignVerticalRowCenter FN_FRAME_ALIGN_VERT_ROW_CENTER
 ()
 [
     AutoUpdate = FALSE,
@@ -316,8 +300,6 @@ SfxVoidItem AlignVerticalRowCenter FN_FRAME_ALIGN_VERT_ROW_CENTER
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -572,7 +554,7 @@ SfxVoidItem ChapterNumberingDialog FN_NUMBERING_OUTLINE_DLG
     GroupId = GID_OPTIONS;
 ]
 
-SfxVoidItem CharBackgroundExt SID_ATTR_CHAR_COLOR_BACKGROUND_EXT
+SfxBoolItem CharBackgroundExt SID_ATTR_CHAR_COLOR_BACKGROUND_EXT
 (SvxColorItem BackColor SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
 [
     AutoUpdate = TRUE,
@@ -583,15 +565,13 @@ SfxVoidItem CharBackgroundExt SID_ATTR_CHAR_COLOR_BACKGROUND_EXT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem CharColorExt SID_ATTR_CHAR_COLOR_EXT
+SfxBoolItem CharColorExt SID_ATTR_CHAR_COLOR_EXT
 (SvxColorItem FontColor SID_ATTR_CHAR_COLOR_EXT)
 [
     AutoUpdate = TRUE,
@@ -602,8 +582,6 @@ SfxVoidItem CharColorExt SID_ATTR_CHAR_COLOR_EXT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -2685,7 +2663,7 @@ SfxVoidItem InsertColumnsAfter FN_TABLE_INSERT_COL_AFTER
     GroupId = GID_TABLE;
 ]
 
-SfxVoidItem InsertSection FN_INSERT_REGION
+SfxUInt16Item InsertSection FN_INSERT_REGION
 (SfxUInt16Item Columns SID_ATTR_COLUMNS,SfxStringItem RegionName FN_PARAM_REGION_NAME,SfxStringItem RegionCondition FN_PARAM_REGION_CONDITION,SfxBoolItem RegionHidden FN_PARAM_REGION_HIDDEN,SfxBoolItem RegionProtect FN_PARAM_REGION_PROTECT,SfxStringItem LinkName FN_PARAM_1,SfxStringItem FilterName FN_PARAM_2,SfxStringItem SubRegion FN_PARAM_3)
 [
     AutoUpdate = FALSE,
@@ -2697,8 +2675,6 @@ SfxVoidItem InsertSection FN_INSERT_REGION
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxUInt16Item
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -2862,7 +2838,7 @@ SfxVoidItem InsertFormula FN_EDIT_FORMULA
     GroupId = GID_INSERT;
 ]
 
-SfxVoidItem InsertFrame FN_INSERT_FRAME
+SfxUInt16Item InsertFrame FN_INSERT_FRAME
 (SfxUInt16Item AnchorType FN_INSERT_FRAME,SfxPointItem Pos FN_PARAM_1,SvxSizeItem Size FN_PARAM_2)
 [
     AutoUpdate = FALSE,
@@ -2874,15 +2850,13 @@ SfxVoidItem InsertFrame FN_INSERT_FRAME
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxUInt16Item
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_INSERT;
 ]
 
-SfxVoidItem InsertFrameInteract FN_INSERT_FRAME_INTERACT
+SfxUInt16Item InsertFrameInteract FN_INSERT_FRAME_INTERACT
 (SfxUInt16Item Columns SID_ATTR_COLUMNS, SfxUInt16Item Modifier SID_MODIFIER)
 [
     AutoUpdate = FALSE,
@@ -2893,8 +2867,6 @@ SfxVoidItem InsertFrameInteract FN_INSERT_FRAME_INTERACT
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxUInt16Item
-
     AccelConfig = FALSE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -3094,7 +3066,7 @@ SfxVoidItem InsertPageCountField FN_INSERT_FLD_PGCOUNT
     GroupId = GID_INSERT;
 ]
 
-SfxVoidItem InsertPageFooter FN_INSERT_PAGEFOOTER
+SfxObjectShellItem InsertPageFooter FN_INSERT_PAGEFOOTER
 (SfxStringItem PageStyle FN_INSERT_PAGEFOOTER,SfxBoolItem On FN_PARAM_1)
 [
     AutoUpdate = FALSE,
@@ -3106,15 +3078,13 @@ SfxVoidItem InsertPageFooter FN_INSERT_PAGEFOOTER
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxObjectShellItem
-
     AccelConfig = FALSE,
     MenuConfig = TRUE,
     ToolBoxConfig = FALSE,
     GroupId = GID_INSERT;
 ]
 
-SfxVoidItem InsertPageHeader FN_INSERT_PAGEHEADER
+SfxObjectShellItem InsertPageHeader FN_INSERT_PAGEHEADER
 (SfxStringItem PageStyle FN_INSERT_PAGEHEADER,SfxBoolItem On FN_PARAM_1)
 [
     AutoUpdate = FALSE,
@@ -3126,8 +3096,6 @@ SfxVoidItem InsertPageHeader FN_INSERT_PAGEHEADER
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxObjectShellItem
-
     AccelConfig = FALSE,
     MenuConfig = TRUE,
     ToolBoxConfig = FALSE,
@@ -3277,7 +3245,7 @@ SfxVoidItem InsertScript FN_JAVAEDIT
     GroupId = GID_INSERT;
 ]
 
-SfxVoidItem InsertTable FN_INSERT_TABLE
+SfxUInt16Item InsertTable FN_INSERT_TABLE
 (SfxStringItem TableName FN_INSERT_TABLE,SfxUInt16Item Columns SID_ATTR_TABLE_COLUMN,SfxUInt16Item Rows SID_ATTR_TABLE_ROW,SfxInt32Item Flags FN_PARAM_1,SfxStringItem AutoFormat FN_PARAM_2)
 [
     AutoUpdate = FALSE,
@@ -3289,8 +3257,6 @@ SfxVoidItem InsertTable FN_INSERT_TABLE
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxUInt16Item
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -4066,7 +4032,7 @@ SfxVoidItem ApplyStyleTextbody FN_FORMAT_APPLY_TEXTBODY
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem MirrorGraphicOnEvenPages FN_GRAPHIC_MIRROR_ON_EVEN_PAGES
+SfxBoolItem MirrorGraphicOnEvenPages FN_GRAPHIC_MIRROR_ON_EVEN_PAGES
 ()
 [
     AutoUpdate = TRUE,
@@ -4077,15 +4043,13 @@ SfxVoidItem MirrorGraphicOnEvenPages FN_GRAPHIC_MIRROR_ON_EVEN_PAGES
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem MirrorOnEvenPages FN_FRAME_MIRROR_ON_EVEN_PAGES
+SfxBoolItem MirrorOnEvenPages FN_FRAME_MIRROR_ON_EVEN_PAGES
 ()
 [
     AutoUpdate = TRUE,
@@ -4096,8 +4060,6 @@ SfxVoidItem MirrorOnEvenPages FN_FRAME_MIRROR_ON_EVEN_PAGES
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -4173,7 +4135,7 @@ SfxVoidItem MoveUpSubItems FN_NUM_BULLET_OUTLINE_MOVEUP
 ]
 
 //-#i68101#------------------------------------------------------------------------
-SfxVoidItem ObjectTitleDescription FN_TITLE_DESCRIPTION_SHAPE
+SfxStringItem ObjectTitleDescription FN_TITLE_DESCRIPTION_SHAPE
 ()
 [
     AutoUpdate = FALSE,
@@ -4185,15 +4147,13 @@ SfxVoidItem ObjectTitleDescription FN_TITLE_DESCRIPTION_SHAPE
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem NameGroup FN_NAME_SHAPE
+SfxStringItem NameGroup FN_NAME_SHAPE
 ()
 [
     AutoUpdate = FALSE,
@@ -4205,8 +4165,6 @@ SfxVoidItem NameGroup FN_NAME_SHAPE
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -4595,7 +4553,7 @@ SfxVoidItem PageDownSel FN_PAGEDOWN_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxVoidItem PageOffsetDialog FN_CHANGE_PAGENUM
+SfxUInt16Item PageOffsetDialog FN_CHANGE_PAGENUM
 (SfxUInt16Item nOffset FN_CHANGE_PAGENUM)
 [
     AutoUpdate = FALSE,
@@ -4607,8 +4565,6 @@ SfxVoidItem PageOffsetDialog FN_CHANGE_PAGENUM
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxUInt16Item
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -4685,7 +4641,7 @@ SfxVoidItem PageUpSel FN_PAGEUP_SEL
     GroupId = GID_NAVIGATOR;
 ]
 
-SfxVoidItem PreviewZoom FN_PREVIEW_ZOOM
+SfxUInt16Item PreviewZoom FN_PREVIEW_ZOOM
 ( SfxUInt16Item PreviewZoom FN_PREVIEW_ZOOM )
 [
     AutoUpdate = FALSE,
@@ -4696,8 +4652,6 @@ SfxVoidItem PreviewZoom FN_PREVIEW_ZOOM
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxUInt16Item
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
@@ -5157,7 +5111,7 @@ SfxVoidItem SendOutlineToStarImpress FN_OUTLINE_TO_IMPRESS
     GroupId = GID_DOCUMENT;
 ]
 
-SfxVoidItem SetAnchorAtChar FN_TOOL_ANCHOR_AT_CHAR
+SfxBoolItem SetAnchorAtChar FN_TOOL_ANCHOR_AT_CHAR
 ()
 [
     AutoUpdate = TRUE,
@@ -5168,15 +5122,13 @@ SfxVoidItem SetAnchorAtChar FN_TOOL_ANCHOR_AT_CHAR
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem SetAnchorToChar FN_TOOL_ANCHOR_CHAR
+SfxBoolItem SetAnchorToChar FN_TOOL_ANCHOR_CHAR
 ()
 [
     AutoUpdate = TRUE,
@@ -5187,15 +5139,13 @@ SfxVoidItem SetAnchorToChar FN_TOOL_ANCHOR_CHAR
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem SetAnchorToFrame FN_TOOL_ANCHOR_FRAME
+SfxBoolItem SetAnchorToFrame FN_TOOL_ANCHOR_FRAME
 ()
 [
     AutoUpdate = TRUE,
@@ -5206,15 +5156,13 @@ SfxVoidItem SetAnchorToFrame FN_TOOL_ANCHOR_FRAME
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem SetAnchorToPage FN_TOOL_ANCHOR_PAGE
+SfxBoolItem SetAnchorToPage FN_TOOL_ANCHOR_PAGE
 ()
 [
     AutoUpdate = TRUE,
@@ -5225,15 +5173,13 @@ SfxVoidItem SetAnchorToPage FN_TOOL_ANCHOR_PAGE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem SetAnchorToPara FN_TOOL_ANCHOR_PARAGRAPH
+SfxBoolItem SetAnchorToPara FN_TOOL_ANCHOR_PARAGRAPH
 ()
 [
     AutoUpdate = TRUE,
@@ -5244,8 +5190,6 @@ SfxVoidItem SetAnchorToPara FN_TOOL_ANCHOR_PARAGRAPH
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -5389,7 +5333,7 @@ SfxVoidItem ShiftBackspace FN_SHIFT_BACKSPACE
     GroupId = GID_EDIT;
 ]
 
-SfxVoidItem ShowMultiplePages FN_SHOW_MULTIPLE_PAGES
+SfxUInt16Item ShowMultiplePages FN_SHOW_MULTIPLE_PAGES
 ( SfxUInt16Item Columns SID_ATTR_TABLE_COLUMN,SfxUInt16Item Rows SID_ATTR_TABLE_ROW )
 [
     AutoUpdate = FALSE,
@@ -5400,7 +5344,6 @@ SfxVoidItem ShowMultiplePages FN_SHOW_MULTIPLE_PAGES
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxUInt16Item
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -5896,7 +5839,7 @@ SfxVoidItem TableDialog FN_FORMAT_TABLE_DLG
     GroupId = GID_TABLE;
 ]
 
-SfxVoidItem TableModeFix FN_TABLE_MODE_FIX
+SfxBoolItem TableModeFix FN_TABLE_MODE_FIX
 ()
 [
     AutoUpdate = TRUE,
@@ -5907,15 +5850,13 @@ SfxVoidItem TableModeFix FN_TABLE_MODE_FIX
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_TABLE;
 ]
 
-SfxVoidItem TableModeFixProp FN_TABLE_MODE_FIX_PROP
+SfxBoolItem TableModeFixProp FN_TABLE_MODE_FIX_PROP
 ()
 [
     AutoUpdate = TRUE,
@@ -5926,15 +5867,13 @@ SfxVoidItem TableModeFixProp FN_TABLE_MODE_FIX_PROP
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
     GroupId = GID_TABLE;
 ]
 
-SfxVoidItem TableModeVariable FN_TABLE_MODE_VARIABLE
+SfxBoolItem TableModeVariable FN_TABLE_MODE_VARIABLE
 ()
 [
     AutoUpdate = TRUE,
@@ -5945,8 +5884,6 @@ SfxVoidItem TableModeVariable FN_TABLE_MODE_VARIABLE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxBoolItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -7130,7 +7067,7 @@ SfxVoidItem DeleteComment FN_DELETE_COMMENT
     GroupId = GID_EDIT;
 ]
 
-SfxVoidItem DeleteAuthor FN_DELETE_NOTE_AUTHOR ( SfxStringItem Author FN_DELETE_NOTE_AUTHOR )
+SfxStringItem DeleteAuthor FN_DELETE_NOTE_AUTHOR ( SfxStringItem Author FN_DELETE_NOTE_AUTHOR )
 [
     AutoUpdate = FALSE,
     FastCall = FALSE,
@@ -7140,8 +7077,6 @@ SfxVoidItem DeleteAuthor FN_DELETE_NOTE_AUTHOR ( SfxStringItem Author FN_DELETE_
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -7199,7 +7134,7 @@ SfxVoidItem HideNote FN_HIDE_NOTE
     GroupId = GID_EDIT;
 ]
 
-SfxVoidItem HideAuthor FN_HIDE_NOTE_AUTHOR ( SfxStringItem Author FN_HIDE_NOTE_AUTHOR )
+SfxStringItem HideAuthor FN_HIDE_NOTE_AUTHOR ( SfxStringItem Author FN_HIDE_NOTE_AUTHOR )
 [
     AutoUpdate = FALSE,
     FastCall = FALSE,
@@ -7209,8 +7144,6 @@ SfxVoidItem HideAuthor FN_HIDE_NOTE_AUTHOR ( SfxStringItem Author FN_HIDE_NOTE_A
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxStringItem
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = FALSE,
@@ -7432,7 +7365,7 @@ SfxVoidItem NavigateForward FN_NAVIGATION_FORWARD
     GroupId = GID_NAVIGATION;
 ]
 
-SfxVoidItem OpenFromWriter FN_OPEN_FILE
+SfxStringItem OpenFromWriter FN_OPEN_FILE
 ()
 [
     AutoUpdate = FALSE,
@@ -7444,8 +7377,6 @@ SfxVoidItem OpenFromWriter FN_OPEN_FILE
     RecordPerSet;
     Asynchron;
 
-    SlotType = SfxStringItem
-
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
@@ -7720,7 +7651,7 @@ SfxVoidItem UnicodeNotationToggle SID_UNICODE_NOTATION_TOGGLE
     GroupId = GID_OPTIONS;
 ]
 
-SfxVoidItem JumpToSpecificPage SID_JUMP_TO_SPECIFIC_PAGE
+SfxUInt16Item JumpToSpecificPage SID_JUMP_TO_SPECIFIC_PAGE
 ( SfxUInt16Item JumpToSpecificPage SID_JUMP_TO_SPECIFIC_PAGE )
 [
     AutoUpdate = FALSE,
@@ -7731,8 +7662,6 @@ SfxVoidItem JumpToSpecificPage SID_JUMP_TO_SPECIFIC_PAGE
     RecordAbsolute = FALSE,
     RecordPerSet;
 
-    SlotType = SfxUInt16Item
-
     AccelConfig = FALSE,
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
commit 20f33eb7c5ebf2611008f6173da870bd0d1693fc
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Apr 30 03:09:14 2017 +0300

    svidl: Remove nested method support
    
    No diff in workdir/SdiTarget.
    
    Change-Id: I53e974c8ccafbbc3675f67b87a0e1b8ff19b6790

diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 06e98097380f..4816332ef6cf 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -27,7 +27,6 @@ class SvMetaSlot : public SvMetaAttribute
 {
 public:
     tools::SvRef<SvMetaType>      aSlotType;
-    tools::SvRef<SvMetaSlot>      aMethod;
     SvIdentifier     aGroupId;
     SvIdentifier     aExecMethod;
     SvIdentifier     aStateMethod;
@@ -59,7 +58,6 @@ public:
                             size_t nStart,
                             SvIdlDataBase & rBase, SvStream & rOutStm );
 
-    OString         GetMangleName() const;
     bool            IsVariable() const;
     bool            IsMethod() const;
 
@@ -86,7 +84,6 @@ public:
             SvMetaSlot();
             SvMetaSlot( SvMetaType * pType );
 
-    SvMetaAttribute *   GetMethod() const;
     SvMetaType *        GetSlotType() const;
     const OString&      GetGroupId() const;
     const OString&      GetExecMethod() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index ff0760d7addc..018b57cf202c 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -77,17 +77,8 @@ bool SvMetaSlot::IsVariable() const
 
 bool SvMetaSlot::IsMethod() const
 {
-    bool b = GetType()->GetMetaTypeType() == MetaTypeType::Method;
-    b |= nullptr != GetMethod();
-    return b;
-}
-
-OString SvMetaSlot::GetMangleName() const
-{
-    SvMetaAttribute * pMeth = GetMethod();
-    if( pMeth )
-        return pMeth->GetName();
-    return GetName();
+    SvMetaType * pType = GetType();
+    return pType->GetMetaTypeType() == MetaTypeType::Method;
 }
 
 /*************************************************************************
@@ -102,11 +93,6 @@ SvMetaType * SvMetaSlot::GetSlotType() const
     if( aSlotType.is() || !GetRef() ) return aSlotType.get();
     return static_cast<SvMetaSlot *>(GetRef())->GetSlotType();
 }
-SvMetaAttribute * SvMetaSlot::GetMethod() const
-{
-    if( aMethod.is() || !GetRef() ) return aMethod.get();
-    return static_cast<SvMetaSlot *>(GetRef())->GetMethod();
-}
 const OString& SvMetaSlot::GetGroupId() const
 {
     if( !aGroupId.getString().isEmpty() || !GetRef() ) return aGroupId.getString();
@@ -273,26 +259,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
             rInStm.Seek( nTokPos );
 
         }
-        if( !aMethod.is() )
-        {
-            SvToken& rTok = rInStm.GetToken();
-            if( rTok.IsIdentifier() )
-            {
-                aMethod = new SvMetaSlot();
-                sal_uInt32 nTokPos = rInStm.Tell();
-                if( aMethod->ReadSvIdl( rBase, rInStm ) )
-                {
-                    if( aMethod->IsMethod() )
-                    {
-                        aMethod->SetSlotId( GetSlotId() );
-                        if( aMethod->Test( rInStm ) )
-                            return;
-                    }
-                    rInStm.Seek( nTokPos );
-                }
-                aMethod.clear();
-            }
-        }
     }
 }
 
@@ -646,12 +612,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
 
         if( IsMethod() )
         {
-            SvMetaAttribute * pMethod = GetMethod();
-            SvMetaType * pType;
-            if( pMethod )
-                pType = pMethod->GetType();
-            else
-                pType = GetType();
+            SvMetaType * pType = GetType();
             sal_uLong nSCount = pType->GetAttrCount();
             rOutStm
                .WriteOString( OString::number(nSCount) )
@@ -671,7 +632,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
 
     {
         rOutStm.WriteCharPtr( ",\"" );
-        rOutStm.WriteOString( GetMangleName() );
+        rOutStm.WriteOString( GetName() );
         rOutStm.WriteCharPtr( "\"" );
     }
 
@@ -683,14 +644,9 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO
     if ( !GetExport() && !GetHidden() )
         return 0;
 
-    SvMetaAttribute * pMethod = GetMethod();
     if( IsMethod() )
     {
-        SvMetaType * pType;
-        if( pMethod )
-            pType = pMethod->GetType();
-        else
-            pType = GetType();
+        SvMetaType * pType = GetType();
 
         if( !SvIdlDataBase::FindType( pType, rBase.aUsedTypes ) )
             rBase.aUsedTypes.push_back( pType );
@@ -729,13 +685,7 @@ sal_uInt16 SvMetaSlot::WriteSlotMap( const OString& rShellName, sal_uInt16 nCoun
     sal_uInt16 nSCount = 0;
     if( IsMethod() )
     {
-        SvMetaType * pType;
-        SvMetaAttribute * pMethod = GetMethod();
-        if( pMethod )
-            pType = pMethod->GetType();
-        else
-            pType = GetType();
-
+        SvMetaType * pType = GetType();
         nSCount = (sal_uInt16)pType->GetAttrCount();
     }
 
diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx
index d7d134723cf4..da8e574c17a6 100644
--- a/idl/source/prj/parser.cxx
+++ b/idl/source/prj/parser.cxx
@@ -445,26 +445,6 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot )
         rInStm.Seek( nTokPos );
 
     }
-    if( !rSlot.aMethod.is() )
-    {
-        SvToken& rTok = rInStm.GetToken();
-        if( rTok.IsIdentifier() )
-        {
-            rSlot.aMethod = new SvMetaSlot();
-            sal_uInt32 nTokPos = rInStm.Tell();
-            if( rSlot.aMethod->ReadSvIdl( rBase, rInStm ) )
-            {
-                if( rSlot.aMethod->IsMethod() )
-                {
-                    rSlot.aMethod->SetSlotId( rSlot.GetSlotId() );
-                    if( rSlot.aMethod->Test( rInStm ) )
-                        return;
-                }
-                rInStm.Seek( nTokPos );
-            }
-            rSlot.aMethod.clear();
-        }
-    }
 }
 
 void SvIdlParser::ReadInterfaceOrShellMethod( SvMetaAttribute& rAttr )
commit e588678f91652cc6f10b5f21716ba05676461467
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Apr 30 02:42:42 2017 +0300

    Return values of sdi "method slots" were unused
    
    Also expand nested methods.
    
    Only diff in workdir/SdiTarget is for SID_STYLE_WATERCAN
    from sw/sdi/_basesh.sdi which changed the .uno name from
    WatercanStyleModeOnOff to StyleWatercanMode, to match the
    name in sfx2/sdi/sfx.sdi (it was forced by svidl to have
    the same name).
    
    Change-Id: Iaeac9f4f10a36cb0b3afe3de2b6def8cd90edc6d

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index f2737bffb9a2..ccf5b74e152b 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -520,7 +520,7 @@ SfxVoidItem Cancel SID_CANCEL
 ]
 
 
-SfxObjectItem Cells SID_SC_CELLS
+SfxVoidItem Cells SID_SC_CELLS
 (SfxInt16Item Column SID_SC_CELLS,SfxInt32Item Row FN_PARAM_1,SfxInt16Item Table FN_PARAM_2)
 [
     AutoUpdate = FALSE,
@@ -538,7 +538,7 @@ SfxObjectItem Cells SID_SC_CELLS
 ]
 
 
-SfxStringItem CellText SID_SC_CELLTEXT
+SfxVoidItem CellText SID_SC_CELLTEXT
 (SfxInt16Item Column SID_SC_CELLTEXT,SfxInt32Item Row FN_PARAM_1,SfxInt16Item Table FN_PARAM_2)
 [
     AutoUpdate = FALSE,
@@ -702,7 +702,7 @@ SfxInt16Item Column SID_RANGE_COL
 ]
 
 
-SfxUInt16Item ColumnWidth FID_COL_WIDTH
+SfxVoidItem ColumnWidth FID_COL_WIDTH
 (SfxUInt16Item Column FN_PARAM_1,SfxUInt16Item Width FN_PARAM_2)
 [
     AutoUpdate = FALSE,
@@ -1095,7 +1095,7 @@ SfxVoidItem DataFilterStandardFilter SID_FILTER
 ]
 
 
-SfxObjectItem DataPilotCreate SID_PIVOT_CREATE
+SfxVoidItem DataPilotCreate SID_PIVOT_CREATE
 (SfxStringItem Destination FN_PARAM_1,SfxStringItem Name FN_PARAM_2,SfxBoolItem TotalCol FN_PARAM_3,SfxBoolItem TotalRow FN_PARAM_4)
 [
     AutoUpdate = FALSE,
@@ -2542,7 +2542,7 @@ SfxVoidItem GoRightToEndOfDataSel SID_CURSORBLKRIGHT_SEL
 ]
 
 
-SfxStringItem GoToCell SID_CURRENTCELL
+SfxVoidItem GoToCell SID_CURRENTCELL
 (SfxStringItem ToPoint SID_CURRENTCELL)
 [
     AutoUpdate = FALSE,
@@ -2596,7 +2596,7 @@ SfxVoidItem GotoDocument SID_CURRENTDOC
 ]
 
 
-SfxStringItem GoToObject SID_CURRENTOBJECT
+SfxVoidItem GoToObject SID_CURRENTOBJECT
 (SfxStringItem ToObject SID_CURRENTOBJECT)
 [
     AutoUpdate = FALSE,
@@ -3451,7 +3451,7 @@ SfxVoidItem ToggleMergeCells FID_MERGE_TOGGLE
 ]
 
 
-SfxBoolItem Mirror SID_OBJECT_MIRROR
+SfxVoidItem Mirror SID_OBJECT_MIRROR
 ()
 [
     AutoUpdate = FALSE,
@@ -3487,7 +3487,7 @@ SfxVoidItem Move FID_TAB_MOVE
 ]
 
 
-SfxStringItem Name FID_TAB_RENAME
+SfxVoidItem Name FID_TAB_RENAME
 (SfxStringItem Name FID_TAB_RENAME,SfxUInt16Item Index FN_PARAM_1)
 [
     AutoUpdate = FALSE,
@@ -3964,7 +3964,7 @@ SfxInt32Item ObjectWidth SID_OBJECT_WIDTH
 ]
 
 
-SfxObjectItem Offset SID_RANGE_OFFSET
+SfxVoidItem Offset SID_RANGE_OFFSET
 (SfxInt16Item Column FN_PARAM_1,SfxInt32Item Row FN_PARAM_2,SfxInt16Item Table FN_PARAM_3)
 [
     AutoUpdate = FALSE,
@@ -4147,7 +4147,7 @@ SfxVoidItem PutCell SID_SC_SETTEXT
 ]
 
 
-SfxObjectItem Range SID_SC_RANGE
+SfxVoidItem Range SID_SC_RANGE
 (SfxStringItem Range SID_SC_RANGE,SfxBoolItem KeepSelect FN_PARAM_1)
 [
     AutoUpdate = FALSE,
@@ -4386,7 +4386,7 @@ SfxInt32Item Row SID_RANGE_ROW
 ]
 
 
-SfxUInt16Item RowHeight FID_ROW_HEIGHT
+SfxVoidItem RowHeight FID_ROW_HEIGHT
 (SfxInt32Item Row FN_PARAM_1,SfxUInt16Item Height FN_PARAM_2)
 [
     AutoUpdate = FALSE,
@@ -4727,7 +4727,7 @@ SfxVoidItem SelectRow SID_SELECT_ROW
 ]
 
 
-SfxStringItem SelectScenario SID_SELECT_SCENARIO
+SfxVoidItem SelectScenario SID_SELECT_SCENARIO
 (SfxStringItem Name SID_SELECT_SCENARIO)
 [
     AutoUpdate = FALSE,
@@ -4745,7 +4745,7 @@ SfxStringItem SelectScenario SID_SELECT_SCENARIO
 ]
 
 
-SfxBoolItem SetAnchorToCell SID_ANCHOR_CELL
+SfxVoidItem SetAnchorToCell SID_ANCHOR_CELL
 ()
 [
     AutoUpdate = FALSE,
@@ -4763,7 +4763,7 @@ SfxBoolItem SetAnchorToCell SID_ANCHOR_CELL
 ]
 
 
-SfxBoolItem SetAnchorToPage SID_ANCHOR_PAGE
+SfxVoidItem SetAnchorToPage SID_ANCHOR_PAGE
 ()
 [
     AutoUpdate = FALSE,
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 217f8562b3a0..9f134a2c887a 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -1423,7 +1423,7 @@ SfxVoidItem Forward SID_MOREFRONT

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list