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

This reverts commit 83a28682f21f7b284aa57f9c336bae551621da03.

89 files changed, 64 insertions, 64 deletions

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