diff options
Diffstat (limited to 'basic/source/classes/sb.cxx')
| -rw-r--r-- | basic/source/classes/sb.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 7bab981f9c..19ef3804c5 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -53,7 +53,7 @@ #include "filefmt.hxx" #include "sb.hrc" #include <basrid.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "errobject.hxx" #include <hash_map> @@ -62,10 +62,6 @@ #include <com/sun/star/script/ModuleInfo.hpp> using namespace ::com::sun::star::script; -#include <com/sun/star/script/ModuleType.hpp> -#include <com/sun/star/script/ModuleInfo.hpp> -using namespace ::com::sun::star::script; - SV_IMPL_VARARR(SbTextPortions,SbTextPortion) TYPEINIT1(StarBASIC,SbxObject) @@ -78,9 +74,6 @@ using com::sun::star::uno::Any; using com::sun::star::uno::UNO_QUERY; using com::sun::star::lang::XMultiServiceFactory; -const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") ); -const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) ); - SbxObject* StarBASIC::getVBAGlobals( ) { if ( !pVBAGlobals ) @@ -89,7 +82,7 @@ SbxObject* StarBASIC::getVBAGlobals( ) if ( GetUNOConstant("ThisComponent", aThisDoc) ) { Reference< XMultiServiceFactory > xDocFac( aThisDoc, UNO_QUERY ); - if ( xDocFac.is() ) + if ( xDocFac.is() ) { try { @@ -101,6 +94,7 @@ SbxObject* StarBASIC::getVBAGlobals( ) } } } + const String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) ); pVBAGlobals = (SbUnoObject*)Find( aVBAHook , SbxCLASS_DONTCARE ); } return pVBAGlobals; @@ -109,6 +103,7 @@ SbxObject* StarBASIC::getVBAGlobals( ) // i#i68894# SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t ) { + const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") ); if( rName == aThisComponent ) return NULL; // rename to init globals @@ -577,6 +572,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule ) if( pObj != NULL ) { String aObjClass = pObj->GetClassName(); + (void)aObjClass; SbClassModuleObject* pClassModuleObj = PTR_CAST(SbClassModuleObject,pObjBase); if( pClassModuleObj != NULL ) @@ -1064,7 +1060,7 @@ void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassMod // Run Init-Code of all modules (including inserted libraries) void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit ) { - ::vos::OGuard guard( Application::GetSolarMutex() ); + SolarMutexGuard guard; // Init own modules for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ ) |