remove duplicated images for basic dialog form controls ( & misc tidyup )

89 files changed, 64 insertions, 64 deletions

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index de6160125a3d..2f03ddee0e5e 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -471,43 +471,43 @@ shell BasicIDEShell
         StateMethod = GetState;
     ]
 
-    SID_INSERT_RADIO
+    SID_INSERT_FORM_RADIO
     [
         ExecMethod      = ExecuteDialog;
         StateMethod     = GetState;
     ]
 
-    SID_INSERT_CHECK
+    SID_INSERT_FORM_CHECK
     [
         ExecMethod      = ExecuteDialog;
         StateMethod     = GetState;
     ]
 
-    SID_INSERT_LIST
+    SID_INSERT_FORM_LIST
     [
         ExecMethod      = ExecuteDialog;
         StateMethod     = GetState;
     ]
 
-    SID_INSERT_COMBO
+    SID_INSERT_FORM_COMBO
     [
         ExecMethod      = ExecuteDialog;
         StateMethod     = GetState;
     ]
 
-    SID_INSERT_VSCROLL
+    SID_INSERT_FORM_VSCROLL
     [
         ExecMethod      = ExecuteDialog;
         StateMethod     = GetState;
     ]
 
-    SID_INSERT_HSCROLL
+    SID_INSERT_FORM_HSCROLL
     [
         ExecMethod      = ExecuteDialog;
         StateMethod     = GetState;
     ]
 
-    SID_INSERT_SPIN
+    SID_INSERT_FORM_SPIN
     [
         ExecMethod      = ExecuteDialog;
         StateMethod     = GetState;
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 2f7ccfb744ba..a4fbd191d8f5 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -402,13 +402,13 @@ void DialogWindow::GetState( SfxItemSet& rSet )
                     rSet.DisableItem( nWh );
             }
             break;
-            case SID_INSERT_RADIO:
-            case SID_INSERT_CHECK:
-            case SID_INSERT_LIST:
-            case SID_INSERT_COMBO:
-            case SID_INSERT_VSCROLL:
-            case SID_INSERT_HSCROLL:
-            case SID_INSERT_SPIN:
+            case SID_INSERT_FORM_RADIO:
+            case SID_INSERT_FORM_CHECK:
+            case SID_INSERT_FORM_LIST:
+            case SID_INSERT_FORM_COMBO:
+            case SID_INSERT_FORM_VSCROLL:
+            case SID_INSERT_FORM_HSCROLL:
+            case SID_INSERT_FORM_SPIN:
             {
                 if ( !bIsCalc || IsReadOnly() )
                     rSet.DisableItem( nWh );
@@ -454,31 +454,31 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
                     pBindings->Invalidate( SID_DOC_MODIFIED );
             }
             break;
-        case SID_INSERT_RADIO:
+        case SID_INSERT_FORM_RADIO:
             GetEditor()->SetMode( DLGED_INSERT );
             GetEditor()->SetInsertObj( OBJ_DLG_FORMRADIO );
             break;
-        case SID_INSERT_CHECK:
+        case SID_INSERT_FORM_CHECK:
             GetEditor()->SetMode( DLGED_INSERT );
             GetEditor()->SetInsertObj( OBJ_DLG_FORMCHECK );
             break;
-        case SID_INSERT_LIST:
+        case SID_INSERT_FORM_LIST:
             GetEditor()->SetMode( DLGED_INSERT );
             GetEditor()->SetInsertObj( OBJ_DLG_FORMLIST );
             break;
-        case SID_INSERT_COMBO:
+        case SID_INSERT_FORM_COMBO:
             GetEditor()->SetMode( DLGED_INSERT );
             GetEditor()->SetInsertObj( OBJ_DLG_FORMCOMBO );
             break;
-        case SID_INSERT_SPIN:
+        case SID_INSERT_FORM_SPIN:
             GetEditor()->SetMode( DLGED_INSERT );
             GetEditor()->SetInsertObj( OBJ_DLG_FORMSPIN );
             break;
-        case SID_INSERT_VSCROLL:
+        case SID_INSERT_FORM_VSCROLL:
             GetEditor()->SetMode( DLGED_INSERT );
             GetEditor()->SetInsertObj( OBJ_DLG_FORMVSCROLL );
             break;
-        case SID_INSERT_HSCROLL:
+        case SID_INSERT_FORM_HSCROLL:
             GetEditor()->SetMode( DLGED_INSERT );
             GetEditor()->SetInsertObj( OBJ_DLG_FORMHSCROLL );
             break;
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index ab9fd013c9f8..9846e6c30858 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -917,13 +917,13 @@ void BasicIDEShell::GetState(SfxItemSet &rSet)
             break;
             case SID_CHOOSE_CONTROLS:
             case SID_DIALOG_TESTMODE:
-            case SID_INSERT_RADIO:
-            case SID_INSERT_CHECK:
-            case SID_INSERT_LIST:
-            case SID_INSERT_COMBO:
-            case SID_INSERT_VSCROLL:
-            case SID_INSERT_HSCROLL:
-            case SID_INSERT_SPIN:
+            case SID_INSERT_FORM_RADIO:
+            case SID_INSERT_FORM_CHECK:
+            case SID_INSERT_FORM_LIST:
+            case SID_INSERT_FORM_COMBO:
+            case SID_INSERT_FORM_VSCROLL:
+            case SID_INSERT_FORM_HSCROLL:
+            case SID_INSERT_FORM_SPIN:
             {
                 if( !pCurWin || !pCurWin->IsA( TYPE( DialogWindow ) ) )
                     rSet.DisableItem( nWh );
diff --git a/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml b/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
index a4afa1d1a748..8e8715992da8 100644
--- a/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormRadio" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertFormCheck" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:RadioBUTTON" toolbar:helpid="helpid:10147"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:CheckBOX" toolbar:helpid="helpid:10148"  toolbar:style="radio" />
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormList" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertFormCombo" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertListBOX" toolbar:helpid="helpid:10191"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:ComboBOX" toolbar:helpid="helpid:10192"  toolbar:style="radio" />
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormVScroll" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertFormHScroll" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:VScrollBAR" toolbar:helpid="helpid:10195"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:HScrollBAR" toolbar:helpid="helpid:10194"  toolbar:style="radio" />
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormSpin" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:SpinBUTTON" toolbar:helpid="helpid:10769"  toolbar:style="radio" />
  <toolbar:toolbarbreak/>
 </toolbar:toolbar>
diff --git a/default_images/cmd/lc_insertformcheck.png b/default_images/cmd/lc_insertformcheck.png
deleted file mode 100644
index 976b300d757c..000000000000
--- a/default_images/cmd/lc_insertformcheck.png
+++ /dev/null
diff --git a/default_images/cmd/lc_insertformcombo.png b/default_images/cmd/lc_insertformcombo.png
deleted file mode 100644
index 848dbb276234..000000000000
--- a/default_images/cmd/lc_insertformcombo.png
+++ /dev/null
diff --git a/default_images/cmd/lc_insertformhscroll.png b/default_images/cmd/lc_insertformhscroll.png
deleted file mode 100644
index 590935df5bb1..000000000000
--- a/default_images/cmd/lc_insertformhscroll.png
+++ /dev/null
diff --git a/default_images/cmd/lc_insertformlist.png b/default_images/cmd/lc_insertformlist.png
deleted file mode 100644
index 622b21d38b9e..000000000000
--- a/default_images/cmd/lc_insertformlist.png
+++ /dev/null
diff --git a/default_images/cmd/lc_insertformradio.png b/default_images/cmd/lc_insertformradio.png
deleted file mode 100644
index 13a406c32062..000000000000
--- a/default_images/cmd/lc_insertformradio.png
+++ /dev/null
diff --git a/default_images/cmd/lc_insertformspin.png b/default_images/cmd/lc_insertformspin.png
deleted file mode 100644
index 5da9aa13ee47..000000000000
--- a/default_images/cmd/lc_insertformspin.png
+++ /dev/null
diff --git a/default_images/cmd/lc_insertformvscroll.png b/default_images/cmd/lc_insertformvscroll.png
deleted file mode 100644
index 5a070c552325..000000000000
--- a/default_images/cmd/lc_insertformvscroll.png
+++ /dev/null
diff --git a/default_images/cmd/sc_insertformcheck.png b/default_images/cmd/sc_insertformcheck.png
deleted file mode 100644
index 3c3343580ad0..000000000000
--- a/default_images/cmd/sc_insertformcheck.png
+++ /dev/null
diff --git a/default_images/cmd/sc_insertformcombo.png b/default_images/cmd/sc_insertformcombo.png
deleted file mode 100644
index 5585f2e0b0b5..000000000000
--- a/default_images/cmd/sc_insertformcombo.png
+++ /dev/null
diff --git a/default_images/cmd/sc_insertformhscroll.png b/default_images/cmd/sc_insertformhscroll.png
deleted file mode 100644
index 7a09c0e9218a..000000000000
--- a/default_images/cmd/sc_insertformhscroll.png
+++ /dev/null
diff --git a/default_images/cmd/sc_insertformlist.png b/default_images/cmd/sc_insertformlist.png
deleted file mode 100644
index 29f39f3afe01..000000000000
--- a/default_images/cmd/sc_insertformlist.png
+++ /dev/null
diff --git a/default_images/cmd/sc_insertformradio.png b/default_images/cmd/sc_insertformradio.png
deleted file mode 100644
index ce8682ad610e..000000000000
--- a/default_images/cmd/sc_insertformradio.png
+++ /dev/null
diff --git a/default_images/cmd/sc_insertformspin.png b/default_images/cmd/sc_insertformspin.png
deleted file mode 100644
index dbf04e4c4722..000000000000
--- a/default_images/cmd/sc_insertformspin.png
+++ /dev/null
diff --git a/default_images/cmd/sc_insertformvscroll.png b/default_images/cmd/sc_insertformvscroll.png
deleted file mode 100644
index 6a09f2fd068c..000000000000
--- a/default_images/cmd/sc_insertformvscroll.png
+++ /dev/null
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
index 3dc69290f4f7..ca4cff1ab630 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
@@ -13,57 +13,57 @@
                      <value xml:lang="en-US">Line Numbers</value>
                  </prop>
             </node>
-            <node oor:name=".uno:InsertFormRadio" oor:op="replace">
+            <node oor:name=".uno:RadioBUTTON" oor:op="replace">
                  <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">Option Button</value>
+                     <value xml:lang="en-US">Form Option Button</value>
                  </prop>
                  <prop oor:name="Properties" oor:type="xs:int">
                      <value>1</value>
                  </prop>
             </node>
-            <node oor:name=".uno:InsertFormCheck" oor:op="replace">
+            <node oor:name=".uno:CheckBOX" oor:op="replace">
                  <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">Check Box</value>
+                     <value xml:lang="en-US">Form Check Box</value>
                  </prop>
                  <prop oor:name="Properties" oor:type="xs:int">
                      <value>1</value>
                  </prop>
             </node>
-            <node oor:name=".uno:InsertFormList" oor:op="replace">
+            <node oor:name=".uno:InsertListBOX" oor:op="replace">
                  <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">List Box</value>
+                     <value xml:lang="en-US">Form List Box</value>
                  </prop>
                  <prop oor:name="Properties" oor:type="xs:int">
                      <value>1</value>
                  </prop>
             </node>
-            <node oor:name=".uno:InsertFormCombo" oor:op="replace">
+            <node oor:name=".uno:ComboBOX" oor:op="replace">
                  <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">Combo Box</value>
+                     <value xml:lang="en-US">Form Combo Box</value>
                  </prop>
                  <prop oor:name="Properties" oor:type="xs:int">
                      <value>1</value>
                  </prop>
             </node>
-            <node oor:name=".uno:InsertFormVScroll" oor:op="replace">
+            <node oor:name=".uno:VScrollBAR" oor:op="replace">
                  <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">Vertical Scroll Bar</value>
+                     <value xml:lang="en-US">Form Vertical Scroll Bar</value>
                  </prop>
                  <prop oor:name="Properties" oor:type="xs:int">
                      <value>1</value>
                  </prop>
             </node>
-            <node oor:name=".uno:InsertFormHScroll" oor:op="replace">
+            <node oor:name=".uno:HScrollBAR" oor:op="replace">
                  <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">Horizonal Scroll Bar</value>
+                     <value xml:lang="en-US">Form Horizonal Scroll Bar</value>
                  </prop>
                  <prop oor:name="Properties" oor:type="xs:int">
                      <value>1</value>
                  </prop>
             </node>
-            <node oor:name=".uno:InsertFormSpin" oor:op="replace">
+            <node oor:name=".uno:SpinBUTTON" oor:op="replace">
                  <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">Spin Button</value>
+                     <value xml:lang="en-US">Form Spin Button</value>
                  </prop>
                  <prop oor:name="Properties" oor:type="xs:int">
                      <value>1</value>
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png b/ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png
deleted file mode 100644
index 3181e294fcbb..000000000000
--- a/ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png b/ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png
deleted file mode 100644
index 43170c65296b..000000000000
--- a/ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png b/ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png
deleted file mode 100644
index 705191c09153..000000000000
--- a/ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformlist.png b/ooo_custom_images/hicontrast/cmd/lc_insertformlist.png
deleted file mode 100644
index dbc038bf66a2..000000000000
--- a/ooo_custom_images/hicontrast/cmd/lc_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformradio.png b/ooo_custom_images/hicontrast/cmd/lc_insertformradio.png
deleted file mode 100644
index 16488054c1f2..000000000000
--- a/ooo_custom_images/hicontrast/cmd/lc_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformspin.png b/ooo_custom_images/hicontrast/cmd/lc_insertformspin.png
deleted file mode 100644
index 363ebb19c1b2..000000000000
--- a/ooo_custom_images/hicontrast/cmd/lc_insertformspin.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png b/ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png
deleted file mode 100644
index ffba6ae86c00..000000000000
--- a/ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png b/ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png
deleted file mode 100644
index 47f1e58b7089..000000000000
--- a/ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png b/ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png
deleted file mode 100644
index 08e5c1013760..000000000000
--- a/ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png b/ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png
deleted file mode 100644
index ee3372263881..000000000000
--- a/ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformlist.png b/ooo_custom_images/hicontrast/cmd/sc_insertformlist.png
deleted file mode 100644
index 31d3858cfca1..000000000000
--- a/ooo_custom_images/hicontrast/cmd/sc_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformradio.png b/ooo_custom_images/hicontrast/cmd/sc_insertformradio.png
deleted file mode 100644
index f4b7641df677..000000000000
--- a/ooo_custom_images/hicontrast/cmd/sc_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformspin.png b/ooo_custom_images/hicontrast/cmd/sc_insertformspin.png
deleted file mode 100644
index 0c66e0d5d9be..000000000000
--- a/ooo_custom_images/hicontrast/cmd/sc_insertformspin.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png b/ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png
deleted file mode 100644
index 79b3148cfd1c..000000000000
--- a/ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/lc_insertformcheck.png b/ooo_custom_images/human/cmd/lc_insertformcheck.png
deleted file mode 100644
index 71565b0b1f71..000000000000
--- a/ooo_custom_images/human/cmd/lc_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/lc_insertformcombo.png b/ooo_custom_images/human/cmd/lc_insertformcombo.png
deleted file mode 100644
index dcfdf62c2f4d..000000000000
--- a/ooo_custom_images/human/cmd/lc_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/lc_insertformhscroll.png b/ooo_custom_images/human/cmd/lc_insertformhscroll.png
deleted file mode 100644
index f375bfb04b51..000000000000
--- a/ooo_custom_images/human/cmd/lc_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/lc_insertformlist.png b/ooo_custom_images/human/cmd/lc_insertformlist.png
deleted file mode 100644
index 387f02c6d831..000000000000
--- a/ooo_custom_images/human/cmd/lc_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/lc_insertformradio.png b/ooo_custom_images/human/cmd/lc_insertformradio.png
deleted file mode 100644
index f38c02c02aae..000000000000
--- a/ooo_custom_images/human/cmd/lc_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/lc_insertformspin.png b/ooo_custom_images/human/cmd/lc_insertformspin.png
deleted file mode 100644
index ea50eef4b24c..000000000000
--- a/ooo_custom_images/human/cmd/lc_insertformspin.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/lc_insertformvscroll.png b/ooo_custom_images/human/cmd/lc_insertformvscroll.png
deleted file mode 100644
index f48faf540aa7..000000000000
--- a/ooo_custom_images/human/cmd/lc_insertformvscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/sc_insertformcheck.png b/ooo_custom_images/human/cmd/sc_insertformcheck.png
deleted file mode 100644
index f9a240949dbe..000000000000
--- a/ooo_custom_images/human/cmd/sc_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/sc_insertformcombo.png b/ooo_custom_images/human/cmd/sc_insertformcombo.png
deleted file mode 100644
index 16d0ae9dbfaf..000000000000
--- a/ooo_custom_images/human/cmd/sc_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/sc_insertformhscroll.png b/ooo_custom_images/human/cmd/sc_insertformhscroll.png
deleted file mode 100644
index 971215d0c8b4..000000000000
--- a/ooo_custom_images/human/cmd/sc_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/sc_insertformlist.png b/ooo_custom_images/human/cmd/sc_insertformlist.png
deleted file mode 100644
index 1ab2bf3e81c8..000000000000
--- a/ooo_custom_images/human/cmd/sc_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/sc_insertformradio.png b/ooo_custom_images/human/cmd/sc_insertformradio.png
deleted file mode 100644
index bca7d6a0a08a..000000000000
--- a/ooo_custom_images/human/cmd/sc_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/sc_insertformspin.png b/ooo_custom_images/human/cmd/sc_insertformspin.png
deleted file mode 100644
index 83aa3a044c60..000000000000
--- a/ooo_custom_images/human/cmd/sc_insertformspin.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/sc_insertformvscroll.png b/ooo_custom_images/human/cmd/sc_insertformvscroll.png
deleted file mode 100644
index ab1b0a49cab0..000000000000
--- a/ooo_custom_images/human/cmd/sc_insertformvscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformcheck.png b/ooo_custom_images/industrial/cmd/lc_insertformcheck.png
deleted file mode 100644
index 55cfeb38768b..000000000000
--- a/ooo_custom_images/industrial/cmd/lc_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformcombo.png b/ooo_custom_images/industrial/cmd/lc_insertformcombo.png
deleted file mode 100644
index dcfdf62c2f4d..000000000000
--- a/ooo_custom_images/industrial/cmd/lc_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformhscroll.png b/ooo_custom_images/industrial/cmd/lc_insertformhscroll.png
deleted file mode 100644
index f375bfb04b51..000000000000
--- a/ooo_custom_images/industrial/cmd/lc_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformlist.png b/ooo_custom_images/industrial/cmd/lc_insertformlist.png
deleted file mode 100644
index 387f02c6d831..000000000000
--- a/ooo_custom_images/industrial/cmd/lc_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformradio.png b/ooo_custom_images/industrial/cmd/lc_insertformradio.png
deleted file mode 100644
index f38c02c02aae..000000000000
--- a/ooo_custom_images/industrial/cmd/lc_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformvscroll.png b/ooo_custom_images/industrial/cmd/lc_insertformvscroll.png
deleted file mode 100644
index f48faf540aa7..000000000000
--- a/ooo_custom_images/industrial/cmd/lc_insertformvscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformcheck.png b/ooo_custom_images/industrial/cmd/sc_insertformcheck.png
deleted file mode 100644
index f9a240949dbe..000000000000
--- a/ooo_custom_images/industrial/cmd/sc_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformcombo.png b/ooo_custom_images/industrial/cmd/sc_insertformcombo.png
deleted file mode 100644
index 16d0ae9dbfaf..000000000000
--- a/ooo_custom_images/industrial/cmd/sc_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformhscroll.png b/ooo_custom_images/industrial/cmd/sc_insertformhscroll.png
deleted file mode 100644
index 971215d0c8b4..000000000000
--- a/ooo_custom_images/industrial/cmd/sc_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformlist.png b/ooo_custom_images/industrial/cmd/sc_insertformlist.png
deleted file mode 100644
index 1ab2bf3e81c8..000000000000
--- a/ooo_custom_images/industrial/cmd/sc_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformradio.png b/ooo_custom_images/industrial/cmd/sc_insertformradio.png
deleted file mode 100644
index bca7d6a0a08a..000000000000
--- a/ooo_custom_images/industrial/cmd/sc_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformvscroll.png b/ooo_custom_images/industrial/cmd/sc_insertformvscroll.png
deleted file mode 100644
index ab1b0a49cab0..000000000000
--- a/ooo_custom_images/industrial/cmd/sc_insertformvscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformcheck.png b/ooo_custom_images/oxygen/cmd/lc_insertformcheck.png
deleted file mode 100644
index 394e634f3f72..000000000000
--- a/ooo_custom_images/oxygen/cmd/lc_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformcombo.png b/ooo_custom_images/oxygen/cmd/lc_insertformcombo.png
deleted file mode 100644
index 0976f6c9ba1f..000000000000
--- a/ooo_custom_images/oxygen/cmd/lc_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png b/ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png
deleted file mode 100644
index 3b54b14508b2..000000000000
--- a/ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformlist.png b/ooo_custom_images/oxygen/cmd/lc_insertformlist.png
deleted file mode 100644
index 34c36522794e..000000000000
--- a/ooo_custom_images/oxygen/cmd/lc_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformradio.png b/ooo_custom_images/oxygen/cmd/lc_insertformradio.png
deleted file mode 100644
index 78358922bc47..000000000000
--- a/ooo_custom_images/oxygen/cmd/lc_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformspin.png b/ooo_custom_images/oxygen/cmd/lc_insertformspin.png
deleted file mode 100644
index a2cf50ffba9a..000000000000
--- a/ooo_custom_images/oxygen/cmd/lc_insertformspin.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png b/ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png
deleted file mode 100644
index 44d16853374d..000000000000
--- a/ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformcheck.png b/ooo_custom_images/oxygen/cmd/lch_insertformcheck.png
deleted file mode 100644
index 1a4ae4cbdb0d..000000000000
--- a/ooo_custom_images/oxygen/cmd/lch_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformcombo.png b/ooo_custom_images/oxygen/cmd/lch_insertformcombo.png
deleted file mode 100644
index 9c6ad0c7861d..000000000000
--- a/ooo_custom_images/oxygen/cmd/lch_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformhscroll.png b/ooo_custom_images/oxygen/cmd/lch_insertformhscroll.png
deleted file mode 100644
index 8571c6bd7680..000000000000
--- a/ooo_custom_images/oxygen/cmd/lch_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformlist.png b/ooo_custom_images/oxygen/cmd/lch_insertformlist.png
deleted file mode 100644
index a4eb77c3eb1a..000000000000
--- a/ooo_custom_images/oxygen/cmd/lch_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformradio.png b/ooo_custom_images/oxygen/cmd/lch_insertformradio.png
deleted file mode 100644
index 7f937206631e..000000000000
--- a/ooo_custom_images/oxygen/cmd/lch_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformspin.png b/ooo_custom_images/oxygen/cmd/lch_insertformspin.png
deleted file mode 100644
index 9550139cc239..000000000000
--- a/ooo_custom_images/oxygen/cmd/lch_insertformspin.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformvscroll.png b/ooo_custom_images/oxygen/cmd/lch_insertformvscroll.png
deleted file mode 100644
index e542676973a3..000000000000
--- a/ooo_custom_images/oxygen/cmd/lch_insertformvscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformcheck.png b/ooo_custom_images/oxygen/cmd/sc_insertformcheck.png
deleted file mode 100644
index 2ddd236cad34..000000000000
--- a/ooo_custom_images/oxygen/cmd/sc_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformcombo.png b/ooo_custom_images/oxygen/cmd/sc_insertformcombo.png
deleted file mode 100644
index 04d90c310755..000000000000
--- a/ooo_custom_images/oxygen/cmd/sc_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformhscroll.png b/ooo_custom_images/oxygen/cmd/sc_insertformhscroll.png
deleted file mode 100644
index 7d2a274cc5a4..000000000000
--- a/ooo_custom_images/oxygen/cmd/sc_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformlist.png b/ooo_custom_images/oxygen/cmd/sc_insertformlist.png
deleted file mode 100644
index bd28be13638d..000000000000
--- a/ooo_custom_images/oxygen/cmd/sc_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformradio.png b/ooo_custom_images/oxygen/cmd/sc_insertformradio.png
deleted file mode 100644
index d4cdb18ab455..000000000000
--- a/ooo_custom_images/oxygen/cmd/sc_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformspin.png b/ooo_custom_images/oxygen/cmd/sc_insertformspin.png
deleted file mode 100644
index 86958dafd043..000000000000
--- a/ooo_custom_images/oxygen/cmd/sc_insertformspin.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformvscroll.png b/ooo_custom_images/oxygen/cmd/sc_insertformvscroll.png
deleted file mode 100644
index 9c17ae4bda62..000000000000
--- a/ooo_custom_images/oxygen/cmd/sc_insertformvscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformcheck.png b/ooo_custom_images/oxygen/cmd/sch_insertformcheck.png
deleted file mode 100644
index e86282340515..000000000000
--- a/ooo_custom_images/oxygen/cmd/sch_insertformcheck.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformcombo.png b/ooo_custom_images/oxygen/cmd/sch_insertformcombo.png
deleted file mode 100644
index 43df64b178e8..000000000000
--- a/ooo_custom_images/oxygen/cmd/sch_insertformcombo.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformhscroll.png b/ooo_custom_images/oxygen/cmd/sch_insertformhscroll.png
deleted file mode 100644
index 58b9b3cf8aa4..000000000000
--- a/ooo_custom_images/oxygen/cmd/sch_insertformhscroll.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformlist.png b/ooo_custom_images/oxygen/cmd/sch_insertformlist.png
deleted file mode 100644
index 3f7a15bda2d6..000000000000
--- a/ooo_custom_images/oxygen/cmd/sch_insertformlist.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformradio.png b/ooo_custom_images/oxygen/cmd/sch_insertformradio.png
deleted file mode 100644
index 6d1756e44b24..000000000000
--- a/ooo_custom_images/oxygen/cmd/sch_insertformradio.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformspin.png b/ooo_custom_images/oxygen/cmd/sch_insertformspin.png
deleted file mode 100644
index 07b61d7b638c..000000000000
--- a/ooo_custom_images/oxygen/cmd/sch_insertformspin.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformvscroll.png b/ooo_custom_images/oxygen/cmd/sch_insertformvscroll.png
deleted file mode 100644
index 603b31e6a733..000000000000
--- a/ooo_custom_images/oxygen/cmd/sch_insertformvscroll.png
+++ /dev/null
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 033ffca74391..f66af83d2a3c 100755
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -1260,16 +1260,16 @@
 #define SID_TRANSLITERATE_TITLE_CASE                    (SID_SVX_START+1103)
 #define SID_TRANSLITERATE_TOGGLE_CASE                   (SID_SVX_START+1104)
 #define SID_TRANSLITERATE_ROTATE_CASE                   (SID_SVX_START+1105)
-#define SID_INSERT_RADIO                                (SID_SVX_START+1106)
-#define SID_INSERT_CHECK                                (SID_SVX_START+1107)
-#define SID_INSERT_LIST                                 (SID_SVX_START+1108)
-#define SID_INSERT_COMBO                                (SID_SVX_START+1109)
-#define SID_INSERT_SPIN                                 (SID_SVX_START+1110)
-#define SID_INSERT_VSCROLL                              (SID_SVX_START+1111)
-#define SID_INSERT_HSCROLL                              (SID_SVX_START+1112)
+#define SID_INSERT_FORM_RADIO                           (SID_SVX_START+1106)
+#define SID_INSERT_FORM_CHECK                           (SID_SVX_START+1107)
+#define SID_INSERT_FORM_LIST                            (SID_SVX_START+1108)
+#define SID_INSERT_FORM_COMBO                           (SID_SVX_START+1109)
+#define SID_INSERT_FORM_SPIN                            (SID_SVX_START+1110)
+#define SID_INSERT_FORM_VSCROLL                         (SID_SVX_START+1111)
+#define SID_INSERT_FORM_HSCROLL                         (SID_SVX_START+1112)
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE                               (SID_INSERT_HSCROLL + 1)
+#define SID_SVX_FIRSTFREE                               (SID_INSERT_FORM_HSCROLL + 1)
 
 // --------------------------------------------------------------------------
 // Overflow check for slot IDs
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 5bfb674a5255..3abbc46e12ed 100755
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8613,7 +8613,7 @@ SfxBoolItem InsertPushbutton SID_INSERT_PUSHBUTTON
 
 //--------------------------------------------------------------------------
 
-SfxBoolItem InsertFormRadio SID_INSERT_RADIO
+SfxBoolItem RadioBUTTON SID_INSERT_FORM_RADIO
 
 [
     /* flags: */
@@ -8640,7 +8640,7 @@ SfxBoolItem InsertFormRadio SID_INSERT_RADIO
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormCheck SID_INSERT_CHECK
+SfxBoolItem CheckBOX SID_INSERT_FORM_CHECK
 
 [
     /* flags: */
@@ -8667,7 +8667,7 @@ SfxBoolItem InsertFormCheck SID_INSERT_CHECK
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormList SID_INSERT_LIST
+SfxBoolItem InsertListBOX SID_INSERT_FORM_LIST
 
 [
     /* flags: */
@@ -8694,7 +8694,7 @@ SfxBoolItem InsertFormList SID_INSERT_LIST
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormCombo SID_INSERT_COMBO
+SfxBoolItem ComboBOX SID_INSERT_FORM_COMBO
 
 [
     /* flags: */
@@ -8720,7 +8720,7 @@ SfxBoolItem InsertFormCombo SID_INSERT_COMBO
     GroupId = GID_CONTROLS;
 ]
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormSpin SID_INSERT_SPIN
+SfxBoolItem SpinBUTTON SID_INSERT_FORM_SPIN
 
 [
     /* flags: */
@@ -8747,7 +8747,7 @@ SfxBoolItem InsertFormSpin SID_INSERT_SPIN
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormVScroll SID_INSERT_VSCROLL
+SfxBoolItem VScrollBAR SID_INSERT_FORM_VSCROLL
 
 [
     /* flags: */
@@ -8775,7 +8775,7 @@ SfxBoolItem InsertFormVScroll SID_INSERT_VSCROLL
 
 //--------------------------------------------------------------------------
 
-SfxBoolItem InsertFormHScroll SID_INSERT_HSCROLL
+SfxBoolItem HScrollBAR SID_INSERT_FORM_HSCROLL
 
 [
     /* flags: */