summaryrefslogtreecommitdiff
path: root/basctl/source
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2012-01-09 15:06:35 +0000
committerNoel Power <noel.power@novell.com>2012-01-10 10:08:44 +0000
commit6639eb9c306cd59482f259330258caea84239fc1 (patch)
tree02c67eef13f9970f500d293eccbd2d84e08c9293 /basctl/source
parent2af8b95af8730fc68ad6fcd3eaab38a799eef580 (diff)
Revert "remove duplicated images for basic dialog form controls ( & misc tidyup )"
This reverts commit 83a28682f21f7b284aa57f9c336bae551621da03.
Diffstat (limited to 'basctl/source')
-rw-r--r--basctl/source/basicide/baside3.cxx28
-rw-r--r--basctl/source/basicide/basides1.cxx14
2 files changed, 21 insertions, 21 deletions
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 );