From ffbd3846d40eaf3dc8e8fa37e57d48ff7da88a5b Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 6 Jan 2012 09:43:42 +0000 Subject: some misc tidyup ( that was reverted ) some id and string renaming from b08e273015d72251b68bca86535cf5919dd9e40e was reverted, those parts of the changes are reapplied here --- basctl/source/basicide/baside3.cxx | 28 ++++++++++++++-------------- basctl/source/basicide/basides1.cxx | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'basctl/source') 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 ); -- cgit