summaryrefslogtreecommitdiff
path: root/embedserv
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-05-31 23:45:53 +0200
committerMichael Stahl <mstahl@redhat.com>2016-06-01 00:11:10 +0200
commitc11e60f11f34b12bf73a08a96634202a8d3aef0c (patch)
treeda82b8736f93578800a4a77acc0c13aaed0e2a84 /embedserv
parent299946676fdced263305db35164950ada1caba0b (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 'embedserv')
-rw-r--r--embedserv/source/embed/docholder.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 556853566a01..7708e1ec3d59 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -1035,7 +1035,7 @@ IDispatch* DocumentHolder::GetIDispatch()
bridge::ModelDependent::OLE );
if ( anyResult.getValueTypeClass() ==
- cppu::UnoType<sal_uInt32>::get().getTypeClass() )
+ cppu::UnoType<sal_uIntPtr>::get().getTypeClass() )
{
VARIANT* pVariant = *(VARIANT**)anyResult.getValue();
if ( pVariant->vt == VT_DISPATCH )