some misc tidyup ( that was reverted )

some id and string renaming from b08e273015d72251b68bca86535cf5919dd9e40e was reverted, those parts of the changes are reapplied here

7 files changed, 50 insertions, 51 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 2b5829bf0d16..55e72c9c7270 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_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 );
@@ -453,31 +453,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 0cded4925d6f..bcf4006ce9e7 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_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..5a4a9ad40162 100644
--- a/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
@@ -12,5 +12,4 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertFormHScroll" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:InsertFormSpin" toolbar:helpid="helpid:10146"  toolbar:style="radio" />
- <toolbar:toolbarbreak/>
 </toolbar:toolbar>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
index 3dc69290f4f7..b8ea36b034ea 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
@@ -15,7 +15,7 @@
             </node>
             <node oor:name=".uno:InsertFormRadio" 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>
@@ -23,7 +23,7 @@
             </node>
             <node oor:name=".uno:InsertFormCheck" 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>
@@ -31,7 +31,7 @@
             </node>
             <node oor:name=".uno:InsertFormList" 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>
@@ -39,7 +39,7 @@
             </node>
             <node oor:name=".uno:InsertFormCombo" 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>
@@ -47,7 +47,7 @@
             </node>
             <node oor:name=".uno:InsertFormVScroll" 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>
@@ -55,7 +55,7 @@
             </node>
             <node oor:name=".uno:InsertFormHScroll" 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>
@@ -63,7 +63,7 @@
             </node>
             <node oor:name=".uno:InsertFormSpin" 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/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..8afec8b9e48e 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 InsertFormRadio SID_INSERT_FORM_RADIO
 
 [
     /* flags: */
@@ -8640,7 +8640,7 @@ SfxBoolItem InsertFormRadio SID_INSERT_RADIO
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormCheck SID_INSERT_CHECK
+SfxBoolItem InsertFormCheck SID_INSERT_FORM_CHECK
 
 [
     /* flags: */
@@ -8667,7 +8667,7 @@ SfxBoolItem InsertFormCheck SID_INSERT_CHECK
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormList SID_INSERT_LIST
+SfxBoolItem InsertFormList SID_INSERT_FORM_LIST
 
 [
     /* flags: */
@@ -8694,7 +8694,7 @@ SfxBoolItem InsertFormList SID_INSERT_LIST
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormCombo SID_INSERT_COMBO
+SfxBoolItem InsertFormCombo SID_INSERT_FORM_COMBO
 
 [
     /* flags: */
@@ -8720,7 +8720,7 @@ SfxBoolItem InsertFormCombo SID_INSERT_COMBO
     GroupId = GID_CONTROLS;
 ]
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormSpin SID_INSERT_SPIN
+SfxBoolItem InsertFormSpin SID_INSERT_FORM_SPIN
 
 [
     /* flags: */
@@ -8747,7 +8747,7 @@ SfxBoolItem InsertFormSpin SID_INSERT_SPIN
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormVScroll SID_INSERT_VSCROLL
+SfxBoolItem InsertFormVScroll SID_INSERT_FORM_VSCROLL
 
 [
     /* flags: */
@@ -8775,7 +8775,7 @@ SfxBoolItem InsertFormVScroll SID_INSERT_VSCROLL
 
 //--------------------------------------------------------------------------
 
-SfxBoolItem InsertFormHScroll SID_INSERT_HSCROLL
+SfxBoolItem InsertFormHScroll SID_INSERT_FORM_HSCROLL
 
 [
     /* flags: */