diff options
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 27 | ||||
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 3 |
2 files changed, 20 insertions, 10 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 001df2aa0b58..eaf1c8804f1e 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -67,6 +67,7 @@ #include <com/sun/star/bridge/oleautomation/Currency.hpp> #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp> #include <com/sun/star/script/XAutomationInvocation.hpp> +#include "basic/codecompletecache.hxx" using com::sun::star::uno::Reference; using namespace com::sun::star::uno; @@ -1731,16 +1732,24 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const OUString& rClass ) which matches the interface names 'ooo.vba.excel.XWorkbooks' or 'ooo.vba.msforms.XLabel'. */ - OUString aClassName( sal_Unicode( '.' ) ); - sal_Int32 nClassNameDot = rClass.lastIndexOf( '.' ); - if( nClassNameDot >= 0 ) + OUString aClassName; + if ( SbiRuntime::isVBAEnabled() ) { - aClassName += rClass.copy( 0, nClassNameDot + 1 ) + OUString( sal_Unicode( 'X' ) ) + rClass.copy( nClassNameDot + 1 ); - } - else - { - aClassName += OUString( sal_Unicode( 'X' ) ) + rClass; + aClassName = "."; + sal_Int32 nClassNameDot = rClass.lastIndexOf( '.' ); + if( nClassNameDot >= 0 ) + { + aClassName += rClass.copy( 0, nClassNameDot + 1 ) + OUString( sal_Unicode( 'X' ) ) + rClass.copy( nClassNameDot + 1 ); + } + else + { + aClassName += OUString( sal_Unicode( 'X' ) ) + rClass; + } } + else // assume extended type declaration support for basic ( can't get here + // otherwise. + aClassName = rClass; + Sequence< Type > aTypeSeq = xTypeProvider->getTypes(); const Type* pTypeArray = aTypeSeq.getConstArray(); sal_uInt32 nIfaceCount = aTypeSeq.getLength(); @@ -1779,7 +1788,7 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const OUString& rClass ) // match interface name with passed class name OSL_TRACE("Checking if object implements %s", OUStringToOString( aClassName, RTL_TEXTENCODING_UTF8 ).getStr() ); - if ( (aClassName.getLength() < aInterfaceName.getLength()) && + if ( (aClassName.getLength() <= aInterfaceName.getLength()) && aInterfaceName.matchIgnoreAsciiCase( aClassName, aInterfaceName.getLength() - aClassName.getLength() ) ) { result = true; diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 4c2ffa97e661..18ea80a00211 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -64,6 +64,7 @@ #include "sb.hrc" #include "sbintern.hxx" #include "sbunoobj.hxx" +#include "basic/codecompletecache.hxx" using com::sun::star::uno::Reference; @@ -3264,7 +3265,7 @@ bool SbiRuntime::checkClass_Impl( const SbxVariableRef& refVal, { if( !implIsClass( pObj, aClass ) ) { - if ( bVBAEnabled && pObj->IsA( TYPE(SbUnoObject) ) ) + if ( ( bVBAEnabled || CodeCompleteOptions::IsExtendedTypeDeclaration() ) && pObj->IsA( TYPE(SbUnoObject) ) ) { SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,pObj); bOk = checkUnoObjectType( pUnoObj, aClass ); |