diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-05-31 23:45:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-06-01 00:11:10 +0200 |
| commit | c11e60f11f34b12bf73a08a96634202a8d3aef0c (patch) | |
| tree | da82b8736f93578800a4a77acc0c13aaed0e2a84 /extensions/test | |
| parent | 299946676fdced263305db35164950ada1caba0b (diff) | |
tdf#99643 OLE automation bridge: fix 64-bit pointer conversions
XBridgeSupplier2::createBridge() is always called in-process and should
therefore expect and create Anys with native-sized encoded pointers,
so use sal_uIntPtr.
Change-Id: Ia757ff38568b07de8085a1a9d323d806bcca0f63
Note: Currently all calls in LO code are with source=UNO, target=OLE.
Diffstat (limited to 'extensions/test')
| -rw-r--r-- | extensions/test/ole/OleClient/funcs.cxx | 2 | ||||
| -rw-r--r-- | extensions/test/ole/OleConverterVar1/convTest.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx index a67cdbb1766e..8070b085a608 100644 --- a/extensions/test/ole/OleClient/funcs.cxx +++ b/extensions/test/ole/OleClient/funcs.cxx @@ -92,7 +92,7 @@ Reference<XInvocation> convertComObject( IUnknown* pUnk) Any any; CComVariant var( pUnk); - any <<= ( sal_uInt32)&var; + any <<= (sal_uIntPtr) &var; sal_uInt8 arId[16]; rtl_getGlobalProcessId( arId); Any target= xSuppl->createBridge( any, Sequence<sal_Int8>( (sal_Int8*)arId, 16), OLE, UNO ); diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index 112f8dee4b10..1c7538cb0752 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -129,7 +129,7 @@ HRESULT doTest() rtl_getGlobalProcessId( arId); Any target= xSuppl->createBridge( any, Sequence<sal_Int8>( (sal_Int8*)arId, 16), UNO, OLE); CComDispatchDriver oletest; - if (target.getValueTypeClass() == cppu::UnoType<sal_uInt32>::get().getTypeClass()) + if (target.getValueTypeClass() == cppu::UnoType<sal_uIntPtr>::get().getTypeClass()) { VARIANT* pVariant = *(VARIANT**)target.getValue(); |