From 1b4cfbea4a103887fa65b0b66a6cac0c8113619e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Thu, 17 Jun 2004 11:37:33 +0000 Subject: [PATCH] INTEGRATION: CWS ooo64bit01 (1.6.8); FILE MERGED 2004/04/05 19:00:11 fa 1.6.8.2: Back out of silly change from earlier, forgot this one 2004/03/29 00:29:47 fa 1.6.8.1: More 64-bit changes. 'rsc' still broken, but not as much as before. --- pyuno/source/module/pyuno_runtime.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 87084c0b246a..1cd082191704 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pyuno_runtime.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2004-02-02 19:30:44 $ + * last change: $Author: rt $ $Date: 2004-06-17 12:37:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -369,7 +369,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const case typelib_TypeClass_UNSIGNED_SHORT: case typelib_TypeClass_LONG: { - long l; + sal_Int32 l; a >>= l; return PyRef( PyInt_FromLong (l), SAL_NO_ACQUIRE ); } @@ -427,7 +427,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const } case typelib_TypeClass_ENUM: { - long l = *(long *) a.getValue(); + sal_Int32 l = *(sal_Int32 *) a.getValue(); TypeDescription desc( a.getValueType() ); if( desc.is() ) {