[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - extensions/source

[Stephan Bergmann]

 extensions/source/ole/unoconversionutilities.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f5754e4145e1aa2f988217d84faa8514dad5e7a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 29 11:37:43 2015 +0200

    Fix Windows 64-bit build
    
    Change-Id: Ie02b1b51463aa9d6c5e80001eb089909995d5b5b
    (cherry picked from commit 9155210d0ad8c9c79c9a493527452b52e7aceb98)

diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 4b64869..1984d10 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1831,7 +1831,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
 #ifdef __MINGW32__
     params[0] <<= reinterpret_cast<sal_uInt32>( spUnknown.p );
 #else
-    params[0] <<= (sal_uInt32) spUnknown.p;
+    params[0] <<= reinterpret_cast<sal_uIntPtr>(spUnknown.p);
 #endif
     sal_Bool bDisp = pVar->vt == VT_DISPATCH ? sal_True : sal_False;
     params[1].setValue( & bDisp, cppu::UnoType<bool>::get());