diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-11-26 15:38:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-11-26 17:01:08 +0100 |
commit | 5a448a920302c52b1366844efeab0f2e23bef95a (patch) | |
tree | 691b718f59c6e61efaf0621b9d715f91d764c627 /extensions/source/ole/unoconversionutilities.hxx | |
parent | ae6e7be84ed377ac63f01fdea323c0d6ee909514 (diff) |
The Windows oleauto.h SafeArray* functions use LONG for indexing
Change-Id: If973cc337e0674462cfe2a15e347881a861a761f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106697
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions/source/ole/unoconversionutilities.hxx')
-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 4065fd682c92..32788abc4ad5 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -154,7 +154,7 @@ public: bool convertValueObject( const VARIANTARG *var, Any& any); void dispatchExObject2Sequence( const VARIANTARG* pvar, Any& anySeq, const Type& type); - Sequence<Any> createOleArrayWrapperOfDim(SAFEARRAY* pArray, unsigned int dimCount, unsigned int actDim, long* index, + Sequence<Any> createOleArrayWrapperOfDim(SAFEARRAY* pArray, unsigned int dimCount, unsigned int actDim, LONG* index, VARTYPE type, const Type& unotype); Sequence<Any> createOleArrayWrapper(SAFEARRAY* pArray, VARTYPE type, const Type& unotype= Type()); @@ -1299,7 +1299,7 @@ SAFEARRAY* UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq) rgsabound[0].lLbound = 0; rgsabound[0].cElements = n; VARIANT oleElement; - long safeI[1]; + LONG safeI[1]; pArray = SafeArrayCreate(VT_VARIANT, 1, rgsabound); @@ -2066,12 +2066,12 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva */ template<class T> Sequence<Any> UnoConversionUtilities<T>::createOleArrayWrapperOfDim(SAFEARRAY* pArray, - unsigned int dimCount, unsigned int actDim, long* index, VARTYPE type, const Type& unotype) + unsigned int dimCount, unsigned int actDim, LONG* index, VARTYPE type, const Type& unotype) { HRESULT hr= S_OK; - long lBound; - long uBound; - long nCountElements; + LONG lBound; + LONG uBound; + LONG nCountElements; SafeArrayGetLBound(pArray, actDim, &lBound); SafeArrayGetUBound(pArray, actDim, &uBound); @@ -2187,8 +2187,8 @@ Sequence<Any> UnoConversionUtilities<T>::createOleArrayWrapper(SAFEARRAY* pArray if (dim > 0) { - std::unique_ptr<long[]> sarIndex(new long[dim]); - long * index = sarIndex.get(); + std::unique_ptr<LONG[]> sarIndex(new LONG[dim]); + LONG * index = sarIndex.get(); for (unsigned int i = 0; i < dim; i++) { |