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

This reverts commit 83a28682f21f7b284aa57f9c336bae551621da03.

4 files changed, 35 insertions, 35 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>