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/source/ole/oleobjw.cxx | |
| 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/source/ole/oleobjw.cxx')
| -rw-r--r-- | extensions/source/ole/oleobjw.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index b2fde4a3a406..2a2b7eb256f1 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -725,7 +725,7 @@ Any SAL_CALL IUnknownWrapper_Impl::createBridge( const Any& modelDepObject, pVariant->punkVal->AddRef(); } - ret.setValue((void*)&pVariant, cppu::UnoType<sal_uInt32>::get()); + ret.setValue(static_cast<void*>(&pVariant), cppu::UnoType<sal_uIntPtr>::get()); } } |