diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-02 15:32:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-02 15:32:01 +0000 |
| commit | 7c826e237da809c0f252ad038fb3f17b25bc5396 (patch) | |
| tree | 7f3082512e1e4eab44ad1aca0e22a116a39a3a69 /basic | |
| parent | f8e2ba9a405cba5f9343f97f26ae4664732e07dc (diff) | |
INTEGRATION: CWS npower4 (1.42.12); FILE MERGED
2006/10/20 15:41:23 npower 1.42.12.3: #i64884# add a test for VBA mode around the setting of the default property
2006/10/19 10:28:26 npower 1.42.12.2: i#64884# remove potential core propducing typo
2006/10/18 20:29:17 npower 1.42.12.1: #i64884# changes for default properties
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 723c93ca2c57..d5092dfba716 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sbunoobj.cxx,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: obo $ $Date: 2006-10-12 14:25:45 $ + * last change: $Author: vg $ $Date: 2006-11-02 16:32:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,6 +76,7 @@ #include <com/sun/star/script/XAllListener.hpp> #include <com/sun/star/script/XInvocationAdapterFactory.hpp> #include <com/sun/star/script/XTypeConverter.hpp> +#include <com/sun/star/script/XDefaultProperty.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/reflection/XIdlArray.hpp> @@ -130,6 +131,39 @@ static String aIllegalArgumentExceptionName ( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.IllegalArgumentException" ) ); static OUString aSeqLevelStr( RTL_CONSTASCII_USTRINGPARAM("[]") ); +// Gets the default property for an uno object. Note: There is some +// redirection built in. The property name specifies the name +// of the default property. + +bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp ) +{ + bool result = false; + Reference< XDefaultProperty> xDefaultProp( pUnoObj->maTmpUnoObj, UNO_QUERY ); + if ( xDefaultProp.is() ) + { + sDfltProp = xDefaultProp->getDefaultPropertyName(); + if ( sDfltProp.Len() ) + result = true; + } + return result; +} + +SbxVariable* getDefaultProp( SbxVariable* pRef ) +{ + SbxVariable* pDefaultProp = NULL; + SbxObject* pObj = PTR_CAST(SbxObject,(SbxVariable*) pRef); + if ( !pObj ) + { + SbxBase* pObjVarObj = pRef->GetObject(); + pObj = PTR_CAST(SbxObject,pObjVarObj); + } + if ( pObj && pObj->ISA(SbUnoObject) ) + { + SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj); + pDefaultProp = pUnoObj->GetDfltProperty(); + } + return pDefaultProp; +} Reference< XComponentContext > getComponentContext_Impl( void ) { @@ -649,6 +683,13 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue ) // SbUnoObject instanzieren String aName; SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue ); + if ( SbiRuntime::isVBAEnabled() ) + { + String sDfltPropName; + + if ( SbUnoObject::getDefaultPropName( pSbUnoObject, sDfltPropName ) ) + pSbUnoObject->SetDfltProperty( sDfltPropName ); + } SbxObjectRef xWrapper = (SbxObject*)pSbUnoObject; // #51475 Wenn das Objekt ungueltig ist null liefern |