diff options
| author | Noel Power <noel.power@novell.com> | 2012-02-23 12:36:05 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-02-23 14:57:12 +0000 |
| commit | 985ad082a56cd4bc47cd230e11f1cd771e08f9de (patch) | |
| tree | cc5019dda935925908ddb6ad9c85b090b71370c4 /extensions | |
| parent | 249059454f35a55bd7f6756d2b361f8c3e07c8e0 (diff) | |
Revert "fix handling of SAFEARRAY(s) returned as variant in olebridge (fdo#38441)"
This reverts commit 3fcb94311fd7dd40c05ca132e3a30a888316cbbe.
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/ole/unoconversionutilities.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index c94b0bc72998..7cdcea0c700e 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -134,7 +134,7 @@ public: /** @exception com.sun.star.lang.IllegalArgumentException If rSeq does not contain a sequence then the exception is thrown. */ - VARTYPE createUnoSequenceWrapper(const Any& rSeq, SAFEARRAY*& pOutArray ); + SAFEARRAY* createUnoSequenceWrapper(const Any& rSeq); /** @exception com.sun.star.lang.IllegalArgumentException If rSeq does not contain a sequence or elemtype has no proper value then the exception is thrown. @@ -779,12 +779,11 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) } case TypeClass_SEQUENCE: // sequence ??? SafeArray descriptor { - SAFEARRAY* pOutArray = NULL; - VARTYPE eArrayType = createUnoSequenceWrapper(rAny, pOutArray ); - if (pOutArray) + SAFEARRAY* pArray = createUnoSequenceWrapper(rAny); + if (pArray) { - V_VT(pVariant) = VT_ARRAY | eArrayType; - V_ARRAY(pVariant) = pOutArray; + V_VT(pVariant) = VT_ARRAY | VT_VARIANT; + V_ARRAY(pVariant) = pArray; } else { @@ -1296,8 +1295,9 @@ void UnoConversionUtilities<T>::getElementCountAndTypeOfSequence( const Any& rS template<class T> -VARTYPE UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq, SAFEARRAY*& pArray) +SAFEARRAY* UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq) { + SAFEARRAY* pArray = NULL; sal_uInt32 n = 0; if( rSeq.getValueTypeClass() != TypeClass_SEQUENCE ) @@ -1361,7 +1361,7 @@ VARTYPE UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq, SA TYPELIB_DANGER_RELEASE( pSeqElementDesc); - return eTargetElementType; + return pArray; } /* The argument rObj can contain |