Kill remaining PseudoSlots usage

Change-Id: I14a820b7c0baba8d8b17d07715bf17c42c73c8fb
TODO: Remove support code from idl and sfx2 modules
Reviewed-on: https://gerrit.libreoffice.org/35718
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>

4 files changed, 5 insertions, 71 deletions

diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi
index beb700e54b4a..8eda2c5d981d 100644
--- a/svx/sdi/fmslots.sdi
+++ b/svx/sdi/fmslots.sdi
@@ -19,10 +19,7 @@
 interface Form
 {
     SID_FM_CONFIG // ole : no, status : ?
-    [
-        ExecMethod = Execute ;
-        StateMethod = GetState ;
-    ]
+    []
     SID_FM_PUSHBUTTON
     [
         ExecMethod = Execute ;
@@ -627,10 +624,7 @@ shell FmFormShell
     import Form;
 
     SID_FM_CONFIG // ole : no, status : ?
-    [
-        ExecMethod = Execute ;
-        StateMethod = GetState ;
-    ]
+    []
     SID_FM_MORE_CONTROLS
     [
         ExecMethod = Execute ;
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 33daa10e87d8..bc6d05596acd 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -1376,7 +1376,7 @@ SfxBoolItem CheckBox SID_FM_CHECKBOX
 ]
 
 
-SvxChooseControlItem ChooseControls SID_CHOOSE_CONTROLS
+SfxVoidItem ChooseControls SID_CHOOSE_CONTROLS
 
 [
     AutoUpdate = TRUE,
@@ -1392,8 +1392,6 @@ SvxChooseControlItem ChooseControls SID_CHOOSE_CONTROLS
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
     GroupId = GID_CONTROLS;
-    PseudoSlots = TRUE;
-    PseudoPrefix = SID_INSERT;
 ]
 
 
@@ -1679,7 +1677,7 @@ SfxBoolItem Combobox SID_INSERT_COMBOBOX
 ]
 
 
-SfxUInt16Item Config SID_FM_CONFIG
+SfxVoidItem Config SID_FM_CONFIG
 
 [
     AutoUpdate = TRUE,
@@ -1695,8 +1693,6 @@ SfxUInt16Item Config SID_FM_CONFIG
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
     GroupId = GID_CONTROLS;
-    PseudoSlots = TRUE;
-    PseudoPrefix = SID_INSERT;
 ]
 
 
@@ -1716,8 +1712,6 @@ SfxBoolItem MoreControls SID_FM_MORE_CONTROLS
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
     GroupId = GID_CONTROLS;
-    PseudoSlots = TRUE;
-    PseudoPrefix = SID_INSERT;
 ]
 
 
@@ -1737,8 +1731,6 @@ SfxBoolItem FormDesignTools SID_FM_FORM_DESIGN_TOOLS
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
     GroupId = GID_CONTROLS;
-    PseudoSlots = TRUE;
-    PseudoPrefix = SID_INSERT;
 ]
 
 
@@ -5799,7 +5791,7 @@ SfxBoolItem InsertNumericField SID_INSERT_NUMERICFIELD
 ]
 
 
-SvxDrawAlignItem ObjectAlign SID_OBJECT_ALIGN
+SfxVoidItem ObjectAlign SID_OBJECT_ALIGN
 
 [
     AutoUpdate = FALSE,
@@ -5815,8 +5807,6 @@ SvxDrawAlignItem ObjectAlign SID_OBJECT_ALIGN
     MenuConfig = FALSE,
     ToolBoxConfig = TRUE,
     GroupId = GID_FORMAT;
-    PseudoSlots = TRUE;
-    PseudoPrefix = SID_OBJECT_ALIGN;
 ]
 
 
@@ -10838,8 +10828,6 @@ SfxBoolItem ColorSettings SID_COLOR_SETTINGS
         MenuConfig = FALSE,
         ToolBoxConfig = TRUE,
         GroupId = GID_MODIFY;
-        PseudoSlots = TRUE;
-        PseudoPrefix = SID_INSERT;
 ]
 
 
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index 5a047e703b84..3d264f483dc2 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -42,47 +42,6 @@ enum SvxCellOrientationEnum
     SVX_ORIENTATION_STACKED
 };
 
-enum SvxChooseControlEnum
-{
-    SVX_SNAP_PUSHBUTTON,
-    SVX_SNAP_CHECKBOX,
-    SVX_SNAP_RADIOBUTTON,
-    SVX_SNAP_SPINBUTTON,
-    SVX_SNAP_FIXEDTEXT,
-    SVX_SNAP_GROUPBOX,
-    SVX_SNAP_LISTBOX,
-    SVX_SNAP_COMBOBOX,
-    SVX_SNAP_EDIT,
-    SVX_SNAP_HSCROLLBAR,
-    SVX_SNAP_VSCROLLBAR,
-    SVX_SNAP_PREVIEW,
-    SVX_SNAP_SELECT,
-    SVX_SNAP_URLBUTTON,
-    SVX_SNAP_IMAGECONTROL,
-    SVX_SNAP_PROGRESSBAR,
-    SVX_SNAP_HFIXEDLINE,
-    SVX_SNAP_VFIXEDLINE,
-    SVX_SNAP_DATEFIELD,
-    SVX_SNAP_TIMEFIELD,
-    SVX_SNAP_NUMERICFIELD,
-    SVX_SNAP_CURRENCYFIELD,
-    SVX_SNAP_FORMATTEDFIELD,
-    SVX_SNAP_PATTERNFIELD,
-    SVX_SNAP_FILECONTROL,
-    SVX_SNAP_TREECONTROL
-};
-item SvxChooseControlEnum SvxChooseControlItem;
-
-enum SvxDrawAlignEnum
-{
-    SVX_OBJECT_ALIGN_LEFT,
-    SVX_OBJECT_ALIGN_CENTER,
-    SVX_OBJECT_ALIGN_RIGHT,
-    SVX_OBJECT_ALIGN_UP,
-    SVX_OBJECT_ALIGN_MIDDLE,
-    SVX_OBJECT_ALIGN_DOWN
-};
-
 enum SvxAdjust
 {
     SVX_ADJUST_LEFT,
@@ -228,7 +187,6 @@ item FontItalic             SvxPostureItem;  // enum
 item BOOL                   SvxPrintItem;
 item UINT16                 SvxPropSizeItem;        // derived from UInt16Item
 item BOOL                   SvxShadowedItem;
-item SvxDrawAlignEnum       SvxDrawAlignItem;
 item BYTE                   SvxWidowsItem;
 item BOOL                   SvxWordLineModeItem;
 item SvxCellHorJustifyEnum  SvxHorJustifyItem;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 6f75d247510b..31306a94dd73 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -377,7 +377,6 @@ void FmFormShell::Execute(SfxRequest &rReq)
         case SID_FM_SCROLLBAR:
         case SID_FM_SPINBUTTON:
             m_nLastSlot = nSlot;
-            GetViewShell()->GetViewFrame()->GetBindings().Invalidate( SID_FM_CONFIG );
             break;
     }
 
@@ -584,7 +583,6 @@ void FmFormShell::Execute(SfxRequest &rReq)
             break;
         case SID_FM_LEAVE_CREATE:
             m_nLastSlot = 0;
-            GetViewShell()->GetViewFrame()->GetBindings().Invalidate( SID_FM_CONFIG );
             rReq.Done();
             break;
         case SID_FM_SHOW_PROPERTY_BROWSER:
@@ -659,7 +657,6 @@ void FmFormShell::Execute(SfxRequest &rReq)
                 rReq.Done();
 
             m_nLastSlot = SID_FM_DESIGN_MODE;
-            GetViewShell()->GetViewFrame()->GetBindings().Invalidate( SID_FM_CONFIG );
         }
         break;
 
@@ -988,9 +985,6 @@ void FmFormShell::GetState(SfxItemSet &rSet)
                 if (!m_pFormView || !m_bDesignMode || !GetImpl()->getCurrentForm().is() )
                     rSet.DisableItem( nWhich );
                 break;
-            case SID_FM_CONFIG:
-                rSet.Put(SfxUInt16Item(nWhich, m_nLastSlot));
-                break;
             case SID_FM_DESIGN_MODE:
                 if (!m_pFormView || GetImpl()->IsReadonlyDoc() )
                     rSet.DisableItem( nWhich );