strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS intptr (1.68.22); FILE MERGED

Browse source 
2005/09/13 14:50:33 kendy 1.68.22.1: #i54498#
Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer
This commit is contained in:
Kurt Zenker 2005-10-05 14:00:28 +00:00
parent ae9d196058
commit ab607f6be2
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
stoc/source/javavm/javavm.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: javavm.cxx,v $
*
* $Revision: 1.70 $
* $Revision: 1.71 $
*
* last change: $Author: hr $ $Date: 2005-09-26 13:27:10 $
* last change: $Author: kz $ $Date: 2005-10-05 15:00:28 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -1003,13 +1003,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
" that the requested JavaVM pointer is not available")),
static_cast< cppu::OWeakObject * >(this));
}
if (sizeof (m_pJavaVm) <= sizeof (sal_Int32)) {
return css::uno::makeAny(reinterpret_cast< sal_Int32 >(m_pJavaVm));
} else {
OSL_ASSERT(
sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
return css::uno::makeAny(reinterpret_cast< sal_Int64 >(m_pJavaVm));
}
return css::uno::makeAny(reinterpret_cast< sal_IntPtr >(m_pJavaVm));
case RETURN_VIRTUALMACHINE:
OSL_ASSERT(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
return css::uno::makeAny(