npower13_objectmodules: uppercase UNO constants

2 files changed, 10 insertions, 9 deletions

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 29a607bec1..3bc3b455ef 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -490,7 +490,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
             }
         }
     }
-    SetModuleType( com::sun::star::script::ModuleType::Class );
+    SetModuleType( ModuleType::CLASS );
 }
 
 SbClassModuleObject::~SbClassModuleObject()
@@ -790,7 +790,7 @@ SbModule* StarBASIC::MakeModule( const String& rName, const String& rSrc )
 SbModule* StarBASIC::MakeModule32( const String& rName, const ::rtl::OUString& rSrc )
 {
     ModuleInfo mInfo;
-    mInfo.ModuleType = ModuleType::Normal;
+    mInfo.ModuleType = ModuleType::NORMAL;
     return MakeModule32(  rName, mInfo, rSrc );
 }
 SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo, const rtl::OUString& rSrc )
@@ -800,17 +800,17 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo,
     SbModule* p = NULL;
     switch ( mInfo.ModuleType )
     {
-        case ModuleType::Document:
+        case ModuleType::DOCUMENT:
             // In theory we should be able to create Object modules
             // in ordinary basic ( in vba mode thought these are create
             // by the application/basic and not by the user )
             p = new SbObjModule( rName, mInfo, isVBAEnabled() );
             break;
-        case ModuleType::Class:
+        case ModuleType::CLASS:
             p = new SbModule( rName, isVBAEnabled() );
-            p->SetModuleType( com::sun::star::script::ModuleType::Class );	
+            p->SetModuleType( ModuleType::CLASS );
         break;
-        case ModuleType::Form:
+        case ModuleType::FORM:
             p = new SbUserFormModule( rName, mInfo, isVBAEnabled() );
         break;
         default:
@@ -995,7 +995,7 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
             // Only variables qualified by the Module Name e.g. Sheet1.foo
             // should work for Documant && Class type Modules
             INT32 nType = p->GetModuleType();
-            if ( nType == com::sun::star::script::ModuleType::Document || nType == com::sun::star::script::ModuleType::Form )
+            if ( nType == ModuleType::DOCUMENT || nType == ModuleType::FORM )
                 continue;
 
             // otherwise check if the element is available
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 24f84f501e..4b0ca569df 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -54,6 +54,7 @@
 #include <vos/mutex.hxx>
 #include <basic/sbobjmod.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/script/ModuleType.hpp>
 
 
 // for the bsearch
@@ -165,7 +166,7 @@ SbModule::SbModule( const String& rName,  BOOL bVBACompat )
 {
     SetName( rName );
     SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
-    SetModuleType( com::sun::star::script::ModuleType::Normal );
+    SetModuleType( script::ModuleType::NORMAL );
 }
 
 SbModule::~SbModule()
@@ -1503,7 +1504,7 @@ SbObjModule::SbObjModule( const String& rName, const com::sun::star::script::Mod
     : SbModule( rName, bIsVbaCompatible )
 {
     SetModuleType( mInfo.ModuleType );
-    if ( mInfo.ModuleType == script::ModuleType::Form )
+    if ( mInfo.ModuleType == script::ModuleType::FORM )
     {
         SetClassName( rtl::OUString::createFromAscii( "Form" ) );
     }