Kaydet (Commit) d17f9a78 authored tarafından Daniel Rentz's avatar Daniel Rentz

npower13_objectmodules: uppercase UNO constants

üst bbc8bc0b
...@@ -1410,7 +1410,7 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor() ...@@ -1410,7 +1410,7 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor()
{ {
switch( xModule->GetModuleType() ) switch( xModule->GetModuleType() )
{ {
case script::ModuleType::Document: case script::ModuleType::DOCUMENT:
{ {
aLibSubName = String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ); aLibSubName = String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) );
uno::Reference< container::XNameContainer > xLib = aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName ); uno::Reference< container::XNameContainer > xLib = aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
...@@ -1425,13 +1425,13 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor() ...@@ -1425,13 +1425,13 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor()
} }
break; break;
} }
case script::ModuleType::Form: case script::ModuleType::FORM:
aLibSubName = String( IDEResId( RID_STR_USERFORMS ) ); aLibSubName = String( IDEResId( RID_STR_USERFORMS ) );
break; break;
case script::ModuleType::Normal: case script::ModuleType::NORMAL:
aLibSubName = String( IDEResId( RID_STR_NORMAL_MODULES ) ); aLibSubName = String( IDEResId( RID_STR_NORMAL_MODULES ) );
break; break;
case script::ModuleType::Class: case script::ModuleType::CLASS:
aLibSubName = String( IDEResId( RID_STR_CLASS_MODULES ) ); aLibSubName = String( IDEResId( RID_STR_CLASS_MODULES ) );
break; break;
} }
......
...@@ -63,7 +63,7 @@ void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib, ...@@ -63,7 +63,7 @@ void lcl_getObjectName( const uno::Reference< container::XNameContainer >& rLib,
sal_Int32 lcl_getModuleType( const uno::Reference< container::XNameContainer >& rLib, const String& rModName ) sal_Int32 lcl_getModuleType( const uno::Reference< container::XNameContainer >& rLib, const String& rModName )
{ {
sal_Int32 nType = com::sun::star::script::ModuleType::Normal; sal_Int32 nType = com::sun::star::script::ModuleType::NORMAL;
uno::Reference< script::XVBAModuleInfo > xVBAModuleInfo( rLib, uno::UNO_QUERY ); uno::Reference< script::XVBAModuleInfo > xVBAModuleInfo( rLib, uno::UNO_QUERY );
if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( rModName ) ) if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( rModName ) )
{ {
...@@ -448,16 +448,16 @@ void BasicTreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubR ...@@ -448,16 +448,16 @@ void BasicTreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubR
BasicEntryType eType = OBJ_TYPE_UNKNOWN; BasicEntryType eType = OBJ_TYPE_UNKNOWN;
switch( lcl_getModuleType( xLib, aModName ) ) switch( lcl_getModuleType( xLib, aModName ) )
{ {
case script::ModuleType::Document: case script::ModuleType::DOCUMENT:
eType = OBJ_TYPE_DOCUMENT_OBJECTS; eType = OBJ_TYPE_DOCUMENT_OBJECTS;
break; break;
case script::ModuleType::Form: case script::ModuleType::FORM:
eType = OBJ_TYPE_USERFORMS; eType = OBJ_TYPE_USERFORMS;
break; break;
case script::ModuleType::Normal: case script::ModuleType::NORMAL:
eType = OBJ_TYPE_NORMAL_MODULES; eType = OBJ_TYPE_NORMAL_MODULES;
break; break;
case script::ModuleType::Class: case script::ModuleType::CLASS:
eType = OBJ_TYPE_CLASS_MODULES; eType = OBJ_TYPE_CLASS_MODULES;
break; break;
} }
......
...@@ -599,7 +599,7 @@ void __EXPORT BasicIDETabBar::Command( const CommandEvent& rCEvt ) ...@@ -599,7 +599,7 @@ void __EXPORT BasicIDETabBar::Command( const CommandEvent& rCEvt )
if( pWin && pWin->ISA( ModulWindow ) ) if( pWin && pWin->ISA( ModulWindow ) )
{ {
SbModule* pActiveModule = (SbModule*)pBasic->FindModule( pWin->GetName() ); SbModule* pActiveModule = (SbModule*)pBasic->FindModule( pWin->GetName() );
if( pActiveModule && ( pActiveModule->GetModuleType() == script::ModuleType::Document ) ) if( pActiveModule && ( pActiveModule->GetModuleType() == script::ModuleType::DOCUMENT ) )
{ {
aPopup.EnableItem( SID_BASICIDE_DELETECURRENT, FALSE ); aPopup.EnableItem( SID_BASICIDE_DELETECURRENT, FALSE );
aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE ); aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment