[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - basctl/uiconfig default_images/cmd officecfg/registry ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen svx/sdi
Noel Power
noelp at kemper.freedesktop.org
Mon Jan 9 07:01:18 PST 2012
basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml | 15 ++++------
default_images/cmd/lc_insertformcheck.png |binary
default_images/cmd/lc_insertformcombo.png |binary
default_images/cmd/lc_insertformhscroll.png |binary
default_images/cmd/lc_insertformlist.png |binary
default_images/cmd/lc_insertformradio.png |binary
default_images/cmd/lc_insertformspin.png |binary
default_images/cmd/lc_insertformvscroll.png |binary
default_images/cmd/sc_insertformcheck.png |binary
default_images/cmd/sc_insertformcombo.png |binary
default_images/cmd/sc_insertformhscroll.png |binary
default_images/cmd/sc_insertformlist.png |binary
default_images/cmd/sc_insertformradio.png |binary
default_images/cmd/sc_insertformspin.png |binary
default_images/cmd/sc_insertformvscroll.png |binary
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu | 14 ++++-----
ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformlist.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformradio.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformspin.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformlist.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformradio.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformspin.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png |binary
ooo_custom_images/human/cmd/lc_insertformcheck.png |binary
ooo_custom_images/human/cmd/lc_insertformcombo.png |binary
ooo_custom_images/human/cmd/lc_insertformhscroll.png |binary
ooo_custom_images/human/cmd/lc_insertformlist.png |binary
ooo_custom_images/human/cmd/lc_insertformradio.png |binary
ooo_custom_images/human/cmd/lc_insertformspin.png |binary
ooo_custom_images/human/cmd/lc_insertformvscroll.png |binary
ooo_custom_images/human/cmd/sc_insertformcheck.png |binary
ooo_custom_images/human/cmd/sc_insertformcombo.png |binary
ooo_custom_images/human/cmd/sc_insertformhscroll.png |binary
ooo_custom_images/human/cmd/sc_insertformlist.png |binary
ooo_custom_images/human/cmd/sc_insertformradio.png |binary
ooo_custom_images/human/cmd/sc_insertformspin.png |binary
ooo_custom_images/human/cmd/sc_insertformvscroll.png |binary
ooo_custom_images/industrial/cmd/lc_insertformcheck.png |binary
ooo_custom_images/industrial/cmd/lc_insertformcombo.png |binary
ooo_custom_images/industrial/cmd/lc_insertformhscroll.png |binary
ooo_custom_images/industrial/cmd/lc_insertformlist.png |binary
ooo_custom_images/industrial/cmd/lc_insertformradio.png |binary
ooo_custom_images/industrial/cmd/lc_insertformvscroll.png |binary
ooo_custom_images/industrial/cmd/sc_insertformcheck.png |binary
ooo_custom_images/industrial/cmd/sc_insertformcombo.png |binary
ooo_custom_images/industrial/cmd/sc_insertformhscroll.png |binary
ooo_custom_images/industrial/cmd/sc_insertformlist.png |binary
ooo_custom_images/industrial/cmd/sc_insertformradio.png |binary
ooo_custom_images/industrial/cmd/sc_insertformvscroll.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformcheck.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformcombo.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformlist.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformradio.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformspin.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformcheck.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformcombo.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformhscroll.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformlist.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformradio.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformspin.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformvscroll.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformcheck.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformcombo.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformhscroll.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformlist.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformradio.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformspin.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformvscroll.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformcheck.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformcombo.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformhscroll.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformlist.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformradio.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformspin.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformvscroll.png |binary
svx/sdi/svx.sdi | 14 ++++-----
85 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit bffe72a6ac6f4bbfc5be689aaf5839157221970d
Author: Noel Power <noel.power at novell.com>
Date: Fri Jan 6 09:43:42 2012 +0000
some misc tidyup ( that was reverted )
some id and string renaming from b08e273015d72251b68bca86535cf5919dd9e40e was reverted, those parts of the changes are reapplied here
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index de61601..2f03dde 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 2f7ccfb..a4fbd19 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 ab9fd01..9846e6c 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 a4afa1d..5a4a9ad 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 3dc6929..b8ea36b 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 033ffca..f66af83 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 5bfb674..8afec8b 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: */
commit 8fdf889d66a2411995cf7d04aed3c5ec08399735
Author: Noel Power <noel.power at novell.com>
Date: Wed Dec 21 13:12:38 2011 +0000
Revert "remove duplicated images for basic dialog form controls ( & misc tidyup )"
This reverts commit b08e273015d72251b68bca86535cf5919dd9e40e.
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 2f03dde..de61601 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 a4fbd19..2f7ccfb 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_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 );
@@ -454,31 +454,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 9846e6c..ab9fd01 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_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 8e87159..a4afa1d 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 0000000..976b300
Binary files /dev/null and b/default_images/cmd/lc_insertformcheck.png differ
diff --git a/default_images/cmd/lc_insertformcombo.png b/default_images/cmd/lc_insertformcombo.png
new file mode 100644
index 0000000..848dbb2
Binary files /dev/null and b/default_images/cmd/lc_insertformcombo.png differ
diff --git a/default_images/cmd/lc_insertformhscroll.png b/default_images/cmd/lc_insertformhscroll.png
new file mode 100644
index 0000000..590935d
Binary files /dev/null and b/default_images/cmd/lc_insertformhscroll.png differ
diff --git a/default_images/cmd/lc_insertformlist.png b/default_images/cmd/lc_insertformlist.png
new file mode 100644
index 0000000..622b21d
Binary files /dev/null and b/default_images/cmd/lc_insertformlist.png differ
diff --git a/default_images/cmd/lc_insertformradio.png b/default_images/cmd/lc_insertformradio.png
new file mode 100644
index 0000000..13a406c
Binary files /dev/null and b/default_images/cmd/lc_insertformradio.png differ
diff --git a/default_images/cmd/lc_insertformspin.png b/default_images/cmd/lc_insertformspin.png
new file mode 100644
index 0000000..5da9aa1
Binary files /dev/null and b/default_images/cmd/lc_insertformspin.png differ
diff --git a/default_images/cmd/lc_insertformvscroll.png b/default_images/cmd/lc_insertformvscroll.png
new file mode 100644
index 0000000..5a070c5
Binary files /dev/null and b/default_images/cmd/lc_insertformvscroll.png differ
diff --git a/default_images/cmd/sc_insertformcheck.png b/default_images/cmd/sc_insertformcheck.png
new file mode 100644
index 0000000..3c33435
Binary files /dev/null and b/default_images/cmd/sc_insertformcheck.png differ
diff --git a/default_images/cmd/sc_insertformcombo.png b/default_images/cmd/sc_insertformcombo.png
new file mode 100644
index 0000000..5585f2e
Binary files /dev/null and b/default_images/cmd/sc_insertformcombo.png differ
diff --git a/default_images/cmd/sc_insertformhscroll.png b/default_images/cmd/sc_insertformhscroll.png
new file mode 100644
index 0000000..7a09c0e
Binary files /dev/null and b/default_images/cmd/sc_insertformhscroll.png differ
diff --git a/default_images/cmd/sc_insertformlist.png b/default_images/cmd/sc_insertformlist.png
new file mode 100644
index 0000000..29f39f3
Binary files /dev/null and b/default_images/cmd/sc_insertformlist.png differ
diff --git a/default_images/cmd/sc_insertformradio.png b/default_images/cmd/sc_insertformradio.png
new file mode 100644
index 0000000..ce8682a
Binary files /dev/null and b/default_images/cmd/sc_insertformradio.png differ
diff --git a/default_images/cmd/sc_insertformspin.png b/default_images/cmd/sc_insertformspin.png
new file mode 100644
index 0000000..dbf04e4
Binary files /dev/null and b/default_images/cmd/sc_insertformspin.png differ
diff --git a/default_images/cmd/sc_insertformvscroll.png b/default_images/cmd/sc_insertformvscroll.png
new file mode 100644
index 0000000..6a09f2f
Binary files /dev/null and b/default_images/cmd/sc_insertformvscroll.png differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
index ca4cff1..3dc6929 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 0000000..3181e29
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png differ
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 0000000..43170c6
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png differ
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 0000000..705191c
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png differ
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 0000000..dbc038b
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformlist.png differ
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 0000000..1648805
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformradio.png differ
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 0000000..363ebb1
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformspin.png differ
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 0000000..ffba6ae
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png differ
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 0000000..47f1e58
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png differ
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 0000000..08e5c10
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png differ
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 0000000..ee33722
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png differ
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 0000000..31d3858
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformlist.png differ
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 0000000..f4b7641
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformradio.png differ
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 0000000..0c66e0d
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformspin.png differ
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 0000000..79b3148
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png differ
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 0000000..71565b0
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformcheck.png differ
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 0000000..dcfdf62
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformcombo.png differ
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 0000000..f375bfb
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformhscroll.png differ
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 0000000..387f02c
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformlist.png differ
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 0000000..f38c02c
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformradio.png differ
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 0000000..ea50eef
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformspin.png differ
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 0000000..f48faf5
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformvscroll.png differ
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 0000000..f9a2409
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformcheck.png differ
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 0000000..16d0ae9
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformcombo.png differ
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 0000000..971215d
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformhscroll.png differ
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 0000000..1ab2bf3
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformlist.png differ
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 0000000..bca7d6a
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformradio.png differ
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 0000000..83aa3a0
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformspin.png differ
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 0000000..ab1b0a4
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformvscroll.png differ
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 0000000..55cfeb3
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformcheck.png differ
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 0000000..dcfdf62
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformcombo.png differ
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 0000000..f375bfb
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformhscroll.png differ
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 0000000..387f02c
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformlist.png differ
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 0000000..f38c02c
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformradio.png differ
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 0000000..f48faf5
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformvscroll.png differ
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 0000000..f9a2409
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformcheck.png differ
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 0000000..16d0ae9
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformcombo.png differ
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 0000000..971215d
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformhscroll.png differ
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 0000000..1ab2bf3
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformlist.png differ
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 0000000..bca7d6a
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformradio.png differ
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 0000000..ab1b0a4
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformvscroll.png differ
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 0000000..394e634
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformcheck.png differ
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 0000000..0976f6c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformcombo.png differ
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 0000000..3b54b14
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png differ
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 0000000..34c3652
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformlist.png differ
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 0000000..7835892
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformradio.png differ
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 0000000..a2cf50f
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformspin.png differ
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 0000000..44d1685
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png differ
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 0000000..1a4ae4c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformcheck.png differ
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 0000000..9c6ad0c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformcombo.png differ
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 0000000..8571c6b
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformhscroll.png differ
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 0000000..a4eb77c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformlist.png differ
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 0000000..7f93720
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformradio.png differ
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 0000000..9550139
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformspin.png differ
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 0000000..e542676
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformvscroll.png differ
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 0000000..2ddd236
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformcheck.png differ
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 0000000..04d90c3
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformcombo.png differ
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 0000000..7d2a274
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformhscroll.png differ
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 0000000..bd28be1
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformlist.png differ
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 0000000..d4cdb18
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformradio.png differ
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 0000000..86958da
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformspin.png differ
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 0000000..9c17ae4
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformvscroll.png differ
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 0000000..e862823
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformcheck.png differ
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 0000000..43df64b
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformcombo.png differ
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 0000000..58b9b3c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformhscroll.png differ
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 0000000..3f7a15b
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformlist.png differ
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 0000000..6d1756e
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformradio.png differ
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 0000000..07b61d7
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformspin.png differ
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 0000000..603b31e
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformvscroll.png differ
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index f66af83..033ffca 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 3abbc46..5bfb674 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: */
More information about the Libreoffice-commits
mailing list