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.
This commit is contained in:
Rüdiger Timm
2004-06-17 11:37:33 +00:00
parent be5cbb30dc
commit 1b4cfbea4a

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: pyuno_runtime.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -369,7 +369,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
case typelib_TypeClass_UNSIGNED_SHORT: case typelib_TypeClass_UNSIGNED_SHORT:
case typelib_TypeClass_LONG: case typelib_TypeClass_LONG:
{ {
long l; sal_Int32 l;
a >>= l; a >>= l;
return PyRef( PyInt_FromLong (l), SAL_NO_ACQUIRE ); return PyRef( PyInt_FromLong (l), SAL_NO_ACQUIRE );
} }
@@ -427,7 +427,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
} }
case typelib_TypeClass_ENUM: case typelib_TypeClass_ENUM:
{ {
long l = *(long *) a.getValue(); sal_Int32 l = *(sal_Int32 *) a.getValue();
TypeDescription desc( a.getValueType() ); TypeDescription desc( a.getValueType() );
if( desc.is() ) if( desc.is() )
{ {