diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-17 12:37:12 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-17 12:37:12 +0200 |
| commit | 2bd59de0da26665eaa2469180988a66b7648191a (patch) | |
| tree | abe837f807632c65b3c8fbce66166bce76666ccd | |
| parent | 3a3aa531e712b5bc53623a4eb43b8d932e88f8a9 (diff) | |
#i10000# fixed bad merge
| -rwxr-xr-x | basic/source/classes/sb.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index dd6e2314ce..e4b4942d94 100755 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -69,10 +69,12 @@ 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 ) -// pVBAGlobals = (SbUnoObject*)Find( String(RTL_CONSTASCII_USTRINGPARAM("VBAGlobals")), SbxCLASS_DONTCARE ); { Any aThisDoc; if ( GetUNOConstant("ThisComponent", aThisDoc) ) @@ -98,7 +100,7 @@ SbxObject* StarBASIC::getVBAGlobals( ) // i#i68894# SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t ) { - if( rName.EqualsAscii("ThisComponent") ) + if( rName == aThisComponent ) return NULL; // rename to init globals if ( getVBAGlobals( ) ) |