From c11e60f11f34b12bf73a08a96634202a8d3aef0c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 31 May 2016 23:45:53 +0200 Subject: 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. --- embedserv/source/embed/docholder.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'embedserv/source') 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::get().getTypeClass() ) + cppu::UnoType::get().getTypeClass() ) { VARIANT* pVariant = *(VARIANT**)anyResult.getValue(); if ( pVariant->vt == VT_DISPATCH ) -- cgit